From 0f3d090bd1dc9a6b912eb0b1e587602573304b4a Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 17 Feb 2016 20:41:52 +0100
Subject: First attempt at QML hacking.

Main and ServiceControl adapted. Project files
---
 rockwork/rockwork.pro | 125 ++++++++++++++++++++++----------------------------
 1 file changed, 54 insertions(+), 71 deletions(-)

(limited to 'rockwork/rockwork.pro')

diff --git a/rockwork/rockwork.pro b/rockwork/rockwork.pro
index 0d04f81..a695e42 100644
--- a/rockwork/rockwork.pro
+++ b/rockwork/rockwork.pro
@@ -1,71 +1,54 @@
-TEMPLATE = app
-TARGET = rockpool
-
-include(../version.pri)
-
-QT += qml quick dbus
-
-CONFIG += c++11
-
-HEADERS += \
-    notificationsourcemodel.h \
-    servicecontrol.h \
-    pebble.h \
-    pebbles.h \
-    applicationsmodel.h \
-    applicationsfiltermodel.h \
-    appstoreclient.h \
-    screenshotmodel.h
-
-SOURCES += main.cpp \
-    notificationsourcemodel.cpp \
-    servicecontrol.cpp \
-    pebble.cpp \
-    pebbles.cpp \
-    applicationsmodel.cpp \
-    applicationsfiltermodel.cpp \
-    appstoreclient.cpp \
-    screenshotmodel.cpp
-
-RESOURCES += rockwork.qrc
-
-QML_FILES += $$files(*.qml,true) \
-             $$files(*.js,true)
-
-CONF_FILES +=  rockwork.apparmor \
-               rockwork.svg \
-               rockwork.desktop \
-               rockwork.url-dispatcher
-
-AP_TEST_FILES += tests/autopilot/run \
-                 $$files(tests/*.py,true)
-
-#show all the files in QtCreator
-OTHER_FILES += $${CONF_FILES} \
-               $${QML_FILES} \
-               $${AP_TEST_FILES} \
-
-
-#specify where the config files are installed to
-config_files.path = /rockpool
-config_files.files += $${CONF_FILES}
-INSTALLS+=config_files
-
-#install the desktop file, a translated version is
-#automatically created in the build directory
-desktop_file.path = /rockpool
-desktop_file.files = $$OUT_PWD/rockpool.desktop
-desktop_file.CONFIG += no_check_exist
-INSTALLS+=desktop_file
-
-# Default rules for deployment.
-target.path = /usr/bin
-INSTALLS+=target
-
-DISTFILES += \
-    NotificationsPage.qml \
-    PebblesPage.qml \
-    AppStorePage.qml \
-    AppStoreDetailsPage.qml \
-    PebbleModels.qml \
-    InfoPage.qml
+TARGET = rockpool
+
+include(../version.pri)
+
+QT += qml quick dbus webkit quick-private webkit-private
+
+CONFIG += c++11
+CONFIG += sailfishapp
+
+HEADERS += \
+    notificationsourcemodel.h \
+    servicecontrol.h \
+    pebble.h \
+    pebbles.h \
+    applicationsmodel.h \
+    applicationsfiltermodel.h \
+    appstoreclient.h \
+    screenshotmodel.h
+
+SOURCES += main.cpp \
+    notificationsourcemodel.cpp \
+    servicecontrol.cpp \
+    pebble.cpp \
+    pebbles.cpp \
+    applicationsmodel.cpp \
+    applicationsfiltermodel.cpp \
+    appstoreclient.cpp \
+    screenshotmodel.cpp
+
+RESOURCES += rockwork.qrc
+
+QML_FILES += $$files(qml/*.qml,true)
+
+CONF_FILES +=  rockpool.png \
+               rockpool.desktop
+
+#show all the files in QtCreator
+OTHER_FILES += $${QML_FILES} \
+               $${CONF_FILES}
+
+#specify where the qml files are installed to
+qml.path = /usr/share/rockpool/qml
+qml.files += $${QML_FILES}
+INSTALLS+=qml
+
+#and the app icon
+icon.path = /usr/share/icons/hicolor/86x86/apps/
+icon.files = rockpool.png
+INSTALLS+=icon
+
+# Default rules for deployment.
+INSTALLS+=target icon
+target.path = /usr/bin
+
-- 
cgit v1.2.3