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
---
 rockworkd/rockworkd.pro | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'rockworkd/rockworkd.pro')

diff --git a/rockworkd/rockworkd.pro b/rockworkd/rockworkd.pro
index a15d64d..888fefc 100644
--- a/rockworkd/rockworkd.pro
+++ b/rockworkd/rockworkd.pro
@@ -4,14 +4,12 @@ QT -= gui
 include(../version.pri)
 
 TARGET = rockpoold
-CONFIG += c++11
-#CONFIG -= app_bundle
-
-TEMPLATE = app
 
-INCLUDEPATH += /usr/lib/arm-linux-gnueabihf/glib-2.0/include /usr/lib/x86_64-linux-gnu/glib-2.0/include/ /usr/include/glib-2.0/
+CONFIG += c++11
+CONFIG += console
+CONFIG += link_pkgconfig
 
-INCLUDEPATH += /usr/include/telepathy-qt5/ /usr/include/quazip/
+INCLUDEPATH += /usr/include/telepathy-qt5/ $$[QT_HOST_PREFIX]/include/quazip/
 LIBS += -lquazip -ltelepathy-qt5
 
 SOURCES += main.cpp \
@@ -48,6 +46,8 @@ SOURCES += main.cpp \
 # Platform integration part
     platformintegration/sailfish/sailfishplatform.cpp \
     platformintegration/sailfish/callchannelobserver.cpp \
+#   platformintegration/sailfish/voicecallmanager.cpp \
+#   platformintegration/sailfish/voicecallhandler.cpp \
     libpebble/blobdb.cpp \
     libpebble/timelineitem.cpp \
     libpebble/notification.cpp \
@@ -99,6 +99,8 @@ HEADERS += \
 # Platform integration part
     platformintegration/sailfish/sailfishplatform.h \
     platformintegration/sailfish/callchannelobserver.h \
+#   platformintegration/sailfish/voicecallmanager.h \
+#   platformintegration/sailfish/voicecallhandler.h \
     libpebble/blobdb.h \
     libpebble/timelineitem.h \
     libpebble/notification.h \
@@ -124,19 +126,14 @@ testing: {
     QT += qml quick
 }
 
-libs.files = /usr/lib/arm-linux-gnueabihf/libQt5Bluetooth.so.5.4.1 \
-             /usr/lib/arm-linux-gnueabihf/libQt5Bluetooth.so.5 \
-             /usr/lib/arm-linux-gnueabihf/libquazip-qt5.so.1.0.0 \
-             /usr/lib/arm-linux-gnueabihf/libquazip-qt5.so.1
-libs.path = /usr/
-INSTALLS += libs
+INSTALLS += target systemd
 
 systemd.files = $${TARGET}.service
 systemd.path = /usr/lib/systemd/user
 
 # Default rules for deployment.
 target.path = /usr/bin
-INSTALLS+=target
 
 RESOURCES += \
     libpebble/jskit/jsfiles.qrc
+
-- 
cgit v1.2.3