From d114dd1b289934c9c8d034622e79e0b913062b19 Mon Sep 17 00:00:00 2001
From: "Javier S. Pedro" <maemo@javispedro.com>
Date: Tue, 3 Jan 2012 21:36:06 +0100
Subject: moving map qml out of qrc

---
 qmapwatchlet/qmapwatchlet.cpp |  2 +-
 qmapwatchlet/qmapwatchlet.pro | 13 ++++++-------
 qmapwatchlet/qmapwatchlet.qrc |  5 -----
 3 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 qmapwatchlet/qmapwatchlet.qrc

(limited to 'qmapwatchlet')

diff --git a/qmapwatchlet/qmapwatchlet.cpp b/qmapwatchlet/qmapwatchlet.cpp
index c77ede4..d90de47 100644
--- a/qmapwatchlet/qmapwatchlet.cpp
+++ b/qmapwatchlet/qmapwatchlet.cpp
@@ -6,6 +6,6 @@ QMapWatchlet::QMapWatchlet(WatchServer* server) :
 	DeclarativeWatchlet(server, "com.javispedro.sowatch.map")
 {
 
-	setSource(QUrl("qrc:/qmapwatchlet/" + server->watch()->model() + ".qml"));
+	setSource(QUrl(SOWATCH_QML_DIR "/qmapwatchlet/" + server->watch()->model() + ".qml"));
 }
 
diff --git a/qmapwatchlet/qmapwatchlet.pro b/qmapwatchlet/qmapwatchlet.pro
index 375861d..b6a441a 100644
--- a/qmapwatchlet/qmapwatchlet.pro
+++ b/qmapwatchlet/qmapwatchlet.pro
@@ -3,11 +3,14 @@ TARGET = qmapwatchlet
 TEMPLATE = lib
 CONFIG   += plugin
 CONFIG   += mobility
+MOBILITY += location
 
 SOURCES += qmapwatchletplugin.cpp qmapwatchlet.cpp
 
 HEADERS += qmapwatchletplugin.h qmapwatchlet.h
 
+qml_files.files = metawatch-digital.qml
+
 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
@@ -20,14 +23,10 @@ unix:!symbian {
 	!isEmpty(MEEGO_VERSION_MAJOR)|maemo5 {
 		QMAKE_RPATHDIR += /opt/sowatch/lib
 		target.path = /opt/sowatch/lib/watchlets
+		qml_files.path = /opt/sowatch/qml/$$TARGET
 	} else {
 		target.path = /usr/lib/sowatch/watchlets
+		qml_files.path = /usr/share/sowatch/qml/$$TARGET
 	}
-	INSTALLS += target
+	INSTALLS += target qml_files
 }
-
-OTHER_FILES += \
-    metawatch-digital.qml
-
-RESOURCES += \
-    qmapwatchlet.qrc
diff --git a/qmapwatchlet/qmapwatchlet.qrc b/qmapwatchlet/qmapwatchlet.qrc
deleted file mode 100644
index 96c215e..0000000
--- a/qmapwatchlet/qmapwatchlet.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/qmapwatchlet">
-        <file>metawatch-digital.qml</file>
-    </qresource>
-</RCC>
-- 
cgit v1.2.3