Merge branch 'master' into dev_local

[qtmeetings] / QtMeetings.pro

diff --git a/QtMeetings.pro b/QtMeetings.pro
index 3ec3197..b4c6c65 100644 (file)
--- a/QtMeetings.pro
+++ b/QtMeetings.pro
@@ -13,13 +13,15 @@ INCLUDEPATH += src/Domain/ \
     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/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 \
@@ -46,13 +48,15 @@ HEADERS += src/IO/DeviceControl/OperationModeToggler.h \
     src/UserInterface/Views/SettingsView.h \
     src/UserInterface/WindowManager.h \
     src/UserInterface/Views/ViewBase.h
-SOURCES += src/IO/DeviceControl/OperationModeToggler.cpp \
+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 \