projects
/
qtmeetings
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into dev_local
[qtmeetings]
/
QtMeetings.pro
diff --git
a/QtMeetings.pro
b/QtMeetings.pro
index
5aa48d3
..
b4c6c65
100644
(file)
--- a/
QtMeetings.pro
+++ b/
QtMeetings.pro
@@
-13,7
+13,8
@@
INCLUDEPATH += src/Domain/ \
src/UserInterface/Components/ \
src/UserInterface/Utils/ \
src/UserInterface/Views/
src/UserInterface/Components/ \
src/UserInterface/Utils/ \
src/UserInterface/Views/
-HEADERS += src/IO/DeviceControl/OperationModeToggler.h \
+HEADERS += src/BusinessLogic/UIManager.h \
+ src/IO/DeviceControl/OperationModeToggler.h \
src/UserInterface/Utils/ProgressBar.h \
src/Domain/Room.h \
src/Domain/Meeting.h \
src/UserInterface/Utils/ProgressBar.h \
src/Domain/Room.h \
src/Domain/Meeting.h \
@@
-45,8
+46,10
@@
HEADERS += src/IO/DeviceControl/OperationModeToggler.h \
src/UserInterface/Views/WeeklyViewWidget.h \
src/UserInterface/Views/MeetingInfoDialog.h \
src/UserInterface/Views/SettingsView.h \
src/UserInterface/Views/WeeklyViewWidget.h \
src/UserInterface/Views/MeetingInfoDialog.h \
src/UserInterface/Views/SettingsView.h \
- src/UserInterface/WindowManager.h
-SOURCES += src/IO/DeviceControl/OperationModeToggler.cpp \
+ src/UserInterface/WindowManager.h \
+ src/UserInterface/Views/ViewBase.h
+SOURCES += src/BusinessLogic/UIManager.cpp \
+ src/IO/DeviceControl/OperationModeToggler.cpp \
src/UserInterface/Utils/ProgressBar.cpp \
src/Domain/Room.cpp \
src/Domain/Meeting.cpp \
src/UserInterface/Utils/ProgressBar.cpp \
src/Domain/Room.cpp \
src/Domain/Meeting.cpp \
@@
-79,6
+82,7
@@
SOURCES += src/IO/DeviceControl/OperationModeToggler.cpp \
src/UserInterface/Views/MeetingInfoDialog.cpp \
src/UserInterface/Views/SettingsView.cpp \
src/UserInterface/WindowManager.cpp \
src/UserInterface/Views/MeetingInfoDialog.cpp \
src/UserInterface/Views/SettingsView.cpp \
src/UserInterface/WindowManager.cpp \
+ src/UserInterface/Views/ViewBase.cpp \
src/main.cpp
RESOURCES += resources/BusinessLogic.qrc \
resources/UserInterface.qrc
src/main.cpp
RESOURCES += resources/BusinessLogic.qrc \
resources/UserInterface.qrc