Cleaning up everything for a Fremantle build

6 files changed, 30 insertions, 34 deletions

diff --git a/metawatch/metawatch.pro b/metawatch/metawatch.pro
index c7cf74b..45f94ba 100644
--- a/metawatch/metawatch.pro
+++ b/metawatch/metawatch.pro
@@ -1,14 +1,14 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2011-09-17T03:22:32
-#
-#-------------------------------------------------
-
 TARGET = metawatchdriver
 TEMPLATE = lib
-# CONFIG   += plugin # Stupid Qt creator doesn't want to deploy plugins
+# CONFIG   += plugin # QtCreator < 2.4 doesn't want to deploy plugins
 QT       += gui
-CONFIG   += mobility
+
+# Qt Mobility 1.2
+maemo5 {
+	CONFIG += mobility12
+} else {
+	CONFIG += mobility
+}
 MOBILITY += connectivity systeminfo
 
 SOURCES += metawatchplugin.cpp \
diff --git a/notificationswatchlet/notificationswatchlet.pro b/notificationswatchlet/notificationswatchlet.pro
index 9791ed6..6ec7459 100644
--- a/notificationswatchlet/notificationswatchlet.pro
+++ b/notificationswatchlet/notificationswatchlet.pro
@@ -2,7 +2,6 @@
 TARGET = notificationswatchlet
 TEMPLATE = lib
 # CONFIG   += plugin
-CONFIG   += mobility
 
 SOURCES += notificationswatchletplugin.cpp notificationswatchlet.cpp
 
diff --git a/qtc_packaging/debian_fremantle/control b/qtc_packaging/debian_fremantle/control
index eb5dfa2..b36faf6 100644
--- a/qtc_packaging/debian_fremantle/control
+++ b/qtc_packaging/debian_fremantle/control
@@ -2,7 +2,7 @@ Source: sowatch
 Section: user/other
 Priority: optional
 Maintainer: Javier <javier@unknown>
-Build-Depends: debhelper (>= 5), libqt4-dev, libqtm-dev
+Build-Depends: debhelper (>= 5), libqt4-dev, libqtm-12-dev, pkg-config
 Standards-Version: 3.7.3
 Homepage: http://gitorious.org/sowatch
 
diff --git a/sowatch.pro b/sowatch.pro
index ca44495..b5bc774 100644
--- a/sowatch.pro
+++ b/sowatch.pro
@@ -1,11 +1,13 @@
 TEMPLATE = subdirs
 SUBDIRS = libsowatch
 
-SUBDIRS += metawatch sowatchd sowatchui
+SUBDIRS += sowatchd
+SUBDIRS += metawatch
+SUBDIRS += sowatchui
 SUBDIRS += notificationswatchlet sysinfowatchlet
 
-metawatch.depends = libsowatch
 sowatchd.depends = libsowatch
+metawatch.depends = libsowatch
 sowatchui.depends = libsowatch sowatchd
 notificationswatchlet.depends = libsowatch
 sysinfowatchlet.depends = libsowatch
diff --git a/sowatchd/sowatchd.pro b/sowatchd/sowatchd.pro
index af13c9e..1ffe3e3 100644
--- a/sowatchd/sowatchd.pro
+++ b/sowatchd/sowatchd.pro
@@ -1,21 +1,21 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2011-09-17T04:55:26
-#
-#-------------------------------------------------
-
 TEMPLATE = app
 
 TARGET = sowatchd
 
 QT       += core gui
-CONFIG   += mobility
 CONFIG   -= app_bundle
+
+# Qt Mobility 1.2
+maemo5 {
+	CONFIG += mobility12
+} else {
+	CONFIG += mobility
+}
 MOBILITY += serviceframework
 
-SOURCES += main.cpp \
-    daemon.cpp \
-    service.cpp
+SOURCES += main.cpp daemon.cpp service.cpp
+
+HEADERS += global.h daemon.h service.h
 
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/release/ -lsowatch
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/debug/ -lsowatch
@@ -35,11 +35,6 @@ unix {
 	INSTALLS += target
 }
 
-HEADERS += \
-    daemon.h \
-    service.h \
-    global.h
-
 xml.path = /opt/sowatch/xml
 xml.files = service.xml
 dbus.path = /usr/share/dbus-1/services
diff --git a/sysinfowatchlet/sysinfowatchlet.pro b/sysinfowatchlet/sysinfowatchlet.pro
index 129bbc9..b59c54d 100644
--- a/sysinfowatchlet/sysinfowatchlet.pro
+++ b/sysinfowatchlet/sysinfowatchlet.pro
@@ -1,14 +1,14 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2011-09-24T00:00:03
-#
-#-------------------------------------------------
-
 TARGET = sysinfowatchlet
 TEMPLATE = lib
 # CONFIG   += plugin # Qt creator doesn't want to deploy plugins
 QT       += network
-CONFIG   += mobility
+
+# Qt Mobility 1.2
+maemo5 {
+	CONFIG += mobility12
+} else {
+	CONFIG += mobility
+}
 MOBILITY += systeminfo
 
 SOURCES += sysinfoplugin.cpp sysinfowatchlet.cpp