From 93f3acd128d6b349efe14e97b12c2703ca4f81f3 Mon Sep 17 00:00:00 2001
From: "Javier S. Pedro" <maemo@javispedro.com>
Date: Thu, 26 Apr 2012 01:36:20 +0200
Subject: Moved the core framework to GConf & D-Bus

---
 metawatch/metawatch.pro | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

(limited to 'metawatch/metawatch.pro')

diff --git a/metawatch/metawatch.pro b/metawatch/metawatch.pro
index 9e99da1..9331665 100644
--- a/metawatch/metawatch.pro
+++ b/metawatch/metawatch.pro
@@ -17,7 +17,8 @@ SOURCES += metawatchplugin.cpp \
     metawatchpaintengine.cpp \
     metawatch.cpp \
     metawatchdigital.cpp \
-    metawatchanalog.cpp
+    metawatchanalog.cpp \
+    metawatchscanner.cpp
 
 HEADERS += metawatchplugin.h \
     metawatchsimulatorform.h \
@@ -25,7 +26,8 @@ HEADERS += metawatchplugin.h \
     metawatchpaintengine.h \
     metawatch.h \
     metawatchdigital.h \
-    metawatchanalog.h
+    metawatchanalog.h \
+    metawatchscanner.h
 
 FORMS += \
 	metawatchsimulatorform.ui
@@ -33,34 +35,19 @@ FORMS += \
 res_files.files += res/graphics res/fonts
 qml_files.files += qml/com
 
-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
-else:symbian: LIBS += -lsowatch
-else:unix: LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch
+LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch
 
 INCLUDEPATH += $$PWD/../libsowatch
 DEPENDPATH += $$PWD/../libsowatch
 
-symbian {
-    MMP_RULES += EXPORTUNFROZEN
-    TARGET.UID3 = 0xE4DC26B0
-    TARGET.CAPABILITY = 
-    TARGET.EPOCALLOWDLLDATA = 1
-	addFiles.sources = metawatchdriver.dll
-    addFiles.path = !:/sys/bin
-    DEPLOYMENT += addFiles
-}
-
-unix:!symbian {
-	!isEmpty(MEEGO_VERSION_MAJOR)|maemo5 {
-		QMAKE_RPATHDIR += /opt/sowatch/lib
-		target.path = /opt/sowatch/lib/drivers
-		res_files.path = /opt/sowatch/share/metawatch
-		qml_files.path = /opt/sowatch/qml
-    } else {
-		target.path = /usr/lib/sowatch/drivers
-		res_files.path = /usr/share/sowatch/metawatch
-		qml_files.path = /usr/share/sowatch/qml
-    }
-	INSTALLS += target res_files qml_files
+!isEmpty(MEEGO_VERSION_MAJOR)|maemo5 {
+	QMAKE_RPATHDIR += /opt/sowatch/lib
+	target.path = /opt/sowatch/lib/drivers
+	res_files.path = /opt/sowatch/share/metawatch
+	qml_files.path = /opt/sowatch/qml
+} else {
+	target.path = /usr/lib/sowatch/drivers
+	res_files.path = /usr/share/sowatch/metawatch
+	qml_files.path = /usr/share/sowatch/qml
 }
+INSTALLS += target res_files qml_files
-- 
cgit v1.2.3