Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

[qtmeetings] / QtMeetings.pro

diff --git a/QtMeetings.pro b/QtMeetings.pro
index 75a7e9a..c57d210 100644 (file)
--- a/QtMeetings.pro
+++ b/QtMeetings.pro
@@ -1,10 +1,7 @@
 TEMPLATE = app
-
 TARGET = qtmeetings
-
 QT += xml \
     network
-
 INCLUDEPATH += src/Domain/ \
     src/Domain/Configuration/ \
     src/IO/ \
@@ -16,8 +13,9 @@ INCLUDEPATH += src/Domain/ \
     src/UserInterface/Components/ \
     src/UserInterface/Utils/ \
     src/UserInterface/Views/
-
-HEADERS += src/Domain/Room.h \
+HEADERS += 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 \
@@ -47,8 +45,9 @@ HEADERS += src/Domain/Room.h \
     src/UserInterface/Views/MeetingInfoDialog.h \
     src/UserInterface/Views/SettingsView.h \
     src/UserInterface/WindowManager.h
-
-SOURCES += src/Domain/Room.cpp \
+SOURCES += 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 \
@@ -79,50 +78,39 @@ SOURCES += src/Domain/Room.cpp \
     src/UserInterface/Views/SettingsView.cpp \
     src/UserInterface/WindowManager.cpp \
     src/main.cpp
-
 RESOURCES += resources/BusinessLogic.qrc \
     resources/UserInterface.qrc
-
 CONFIG += link_pkgconfig
 PKGCONFIG += libalarm
-
 //DEFINES += DEBUG_OUTPUT_TO_FILE
-
 executable.files = qtmeetings
 executable.path = /usr/bin/
 executable.hint = executable
 INSTALLS += executable
-
 appconfig.files = QtMeetings.conf
 appconfig.path = /etc/
 appconfig.hint = appconfig
 INSTALLS += appconfig
-
 desktop.files = QtMeetings.desktop
 desktop.path = /usr/share/applications/hildon/
 desktop.hint = desktop
 INSTALLS += desktop
-
 devstopperscript.files = scripts/qtmeetings-devstopper
 devstopperscript.path = /usr/bin/
 devstopperscript.hint = devstopperscript
 INSTALLS += devstopperscript
-
 renamescript.files = scripts/qtmeetings-rename
 renamescript.path = /usr/bin/
 renamescript.hint = renamescript
 INSTALLS += renamescript
-
 updatercdscript.files = scripts/qtmeetings-updatercd
 updatercdscript.path = /usr/bin/
 updatercdscript.hint = updatercdscript
 INSTALLS += updatercdscript
-
 launcherscript.files = scripts/qtmeetings-launcher
 launcherscript.path = /etc/init.d/
 launcherscript.hint = launcherscript
 INSTALLS += launcherscript
-
 unix:exists( $$system(which doxygen) ) { 
     message( "Doxygen is present in your system." )
     BUILD_NOW = $$prompt( "Do you want to build Doxygen documentation now? [YES/no]" )