diff options
| -rw-r--r-- | notificationswatchlet/notificationswatchlet.cpp | 2 | ||||
| -rw-r--r-- | notificationswatchlet/notificationswatchlet.pro | 12 | ||||
| -rw-r--r-- | notificationswatchlet/notificationswatchlet.qrc | 5 |
3 files changed, 6 insertions, 13 deletions
diff --git a/notificationswatchlet/notificationswatchlet.cpp b/notificationswatchlet/notificationswatchlet.cpp index 01110e9..89e61ca 100644 --- a/notificationswatchlet/notificationswatchlet.cpp +++ b/notificationswatchlet/notificationswatchlet.cpp @@ -5,6 +5,6 @@ using namespace sowatch; NotificationsWatchlet::NotificationsWatchlet(WatchServer* server) : DeclarativeWatchlet(server, "com.javispedro.sowatch.notifications") { - setSource(QUrl("qrc:/notificationswatchlet/" + server->watch()->model() + ".qml")); + setSource(QUrl(SOWATCH_QML_DIR "/notificationswatchlet/" + server->watch()->model() + ".qml")); } diff --git a/notificationswatchlet/notificationswatchlet.pro b/notificationswatchlet/notificationswatchlet.pro index e64a8d6..cf3beff 100644 --- a/notificationswatchlet/notificationswatchlet.pro +++ b/notificationswatchlet/notificationswatchlet.pro @@ -8,6 +8,8 @@ SOURCES += notificationswatchletplugin.cpp notificationswatchlet.cpp HEADERS += notificationswatchletplugin.h notificationswatchlet.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 +22,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 = /opt/sowatch/qml/$$TARGET } - INSTALLS += target + INSTALLS += target qml_files } - -OTHER_FILES += \ - metawatch-digital.qml - -RESOURCES += \ - notificationswatchlet.qrc diff --git a/notificationswatchlet/notificationswatchlet.qrc b/notificationswatchlet/notificationswatchlet.qrc deleted file mode 100644 index a1f217d..0000000 --- a/notificationswatchlet/notificationswatchlet.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="/notificationswatchlet"> - <file>metawatch-digital.qml</file> - </qresource> -</RCC> |