Merge branch 'master' into dev_local

[qtmeetings] / QtMeetings.pro

diff --git a/QtMeetings.pro b/QtMeetings.pro
index cbe1b6c..b4c6c65 100644 (file)
--- a/QtMeetings.pro
+++ b/QtMeetings.pro
@@ -13,12 +13,15 @@ INCLUDEPATH += src/Domain/ \
     src/UserInterface/Components/ \
     src/UserInterface/Utils/ \
     src/UserInterface/Views/
-HEADERS += src/UserInterface/Utils/ProgressBar.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/Domain/Configuration/ConnectionSettings.h \
     src/Domain/Configuration/StartupSettings.h \
     src/Domain/Configuration/DisplaySettings.h \
+    src/Domain/Configuration/DateTimeSettings.h \
     src/Domain/Configuration/Configuration.h \
     src/IO/Communication/MessagingUtils.h \
     src/IO/Communication/Communication.h \
@@ -43,13 +46,17 @@ HEADERS += src/UserInterface/Utils/ProgressBar.h \
     src/UserInterface/Views/WeeklyViewWidget.h \
     src/UserInterface/Views/MeetingInfoDialog.h \
     src/UserInterface/Views/SettingsView.h \
-    src/UserInterface/WindowManager.h
-SOURCES += src/UserInterface/Utils/ProgressBar.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/Domain/Configuration/ConnectionSettings.cpp \
     src/Domain/Configuration/StartupSettings.cpp \
     src/Domain/Configuration/DisplaySettings.cpp \
+    src/Domain/Configuration/DateTimeSettings.cpp \
     src/Domain/Configuration/Configuration.cpp \
     src/IO/Communication/MessagingUtils.cpp \
     src/IO/Communication/Communication.cpp \
@@ -75,13 +82,13 @@ SOURCES += src/UserInterface/Utils/ProgressBar.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
 CONFIG += link_pkgconfig
 PKGCONFIG += libalarm
-
-# DEFINES += QT_NO_DEBUG_OUTPUT
+//DEFINES += DEBUG_OUTPUT_TO_FILE
 executable.files = qtmeetings
 executable.path = /usr/bin/
 executable.hint = executable