1 files changed, 145 insertions, 0 deletions
diff --git a/rockworkd/rockworkd.pro b/rockworkd/rockworkd.pro
index edb97f9..53e37ff 100644
--- a/rockworkd/rockworkd.pro
+++ b/rockworkd/rockworkd.pro
@@ -1,3 +1,147 @@
+<<<<<<< HEAD
+QT += core bluetooth dbus network contacts qml location organizer
+QT -= gui
+
+include(../version.pri)
+
+TARGET = rockpoold
+
+CONFIG += c++11
+CONFIG += console
+CONFIG += link_pkgconfig
+
+INCLUDEPATH += /usr/include/telepathy-qt5/ $$[QT_HOST_PREFIX]/include/quazip/
+LIBS += -lquazip -ltelepathy-qt5
+
+PKGCONFIG += libmkcal-qt5 libkcalcoren-qt5
+INCLUDEPATH += /usr/include/mkcal-qt5 /usr/include/kcalcoren-qt5
+
+SOURCES += main.cpp \
+    libpebble/watchconnection.cpp \
+    libpebble/pebble.cpp \
+    libpebble/watchdatareader.cpp \
+    libpebble/watchdatawriter.cpp \
+    libpebble/notificationendpoint.cpp \
+    libpebble/musicendpoint.cpp \
+    libpebble/phonecallendpoint.cpp \
+    libpebble/musicmetadata.cpp \
+    libpebble/jskit/jskitmanager.cpp \
+    libpebble/jskit/jskitconsole.cpp \
+    libpebble/jskit/jskitgeolocation.cpp \
+    libpebble/jskit/jskitlocalstorage.cpp \
+    libpebble/jskit/jskitpebble.cpp \
+    libpebble/jskit/jskitxmlhttprequest.cpp \
+    libpebble/jskit/jskittimer.cpp \
+    libpebble/jskit/jskitperformance.cpp \
+    libpebble/appinfo.cpp \
+    libpebble/appmanager.cpp \
+    libpebble/appmsgmanager.cpp \
+    libpebble/uploadmanager.cpp \
+    libpebble/bluez/bluezclient.cpp \
+    libpebble/bluez/bluez_agentmanager1.cpp \
+    libpebble/bluez/bluez_adapter1.cpp \
+    libpebble/bluez/bluez_device1.cpp \
+    libpebble/bluez/freedesktop_objectmanager.cpp \
+    libpebble/bluez/freedesktop_properties.cpp \
+    libpebble/bluez/device.cpp \
+    core.cpp \
+    pebblemanager.cpp \
+    dbusinterface.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 \
+    platformintegration/sailfish/organizeradapter.cpp \
+    libpebble/calendarevent.cpp \
+    platformintegration/sailfish/syncmonitorclient.cpp \
+    libpebble/appmetadata.cpp \
+    libpebble/appdownloader.cpp \
+    libpebble/screenshotendpoint.cpp \
+    libpebble/firmwaredownloader.cpp \
+    libpebble/bundle.cpp \
+    libpebble/watchlogendpoint.cpp \
+    libpebble/ziphelper.cpp \
+    libpebble/healthparams.cpp \
+    libpebble/dataloggingendpoint.cpp
+
+HEADERS += \
+    libpebble/watchconnection.h \
+    libpebble/pebble.h \
+    libpebble/watchdatareader.h \
+    libpebble/watchdatawriter.h \
+    libpebble/notificationendpoint.h \
+    libpebble/musicendpoint.h \
+    libpebble/musicmetadata.h \
+    libpebble/phonecallendpoint.h \
+    libpebble/platforminterface.h \
+    libpebble/jskit/jskitmanager.h \
+    libpebble/jskit/jskitconsole.h \
+    libpebble/jskit/jskitgeolocation.h \
+    libpebble/jskit/jskitlocalstorage.h \
+    libpebble/jskit/jskitpebble.h \
+    libpebble/jskit/jskitxmlhttprequest.h \
+    libpebble/jskit/jskittimer.h \
+    libpebble/jskit/jskitperformance.h \
+    libpebble/appinfo.h \
+    libpebble/appmanager.h \
+    libpebble/appmsgmanager.h \
+    libpebble/uploadmanager.h \
+    libpebble/bluez/bluezclient.h \
+    libpebble/bluez/bluez_agentmanager1.h \
+    libpebble/bluez/bluez_adapter1.h \
+    libpebble/bluez/bluez_device1.h \
+    libpebble/bluez/freedesktop_objectmanager.h \
+    libpebble/bluez/freedesktop_properties.h \
+    libpebble/bluez/device.h \
+    core.h \
+    pebblemanager.h \
+    dbusinterface.h \
+# 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 \
+    platformintegration/sailfish/organizeradapter.h \
+    libpebble/calendarevent.h \
+    platformintegration/sailfish/syncmonitorclient.h \
+    libpebble/appmetadata.h \
+    libpebble/appdownloader.h \
+    libpebble/enums.h \
+    libpebble/screenshotendpoint.h \
+    libpebble/firmwaredownloader.h \
+    libpebble/bundle.h \
+    libpebble/watchlogendpoint.h \
+    libpebble/ziphelper.h \
+    libpebble/healthparams.h \
+    libpebble/dataloggingendpoint.h
+
+testing: {
+    SOURCES += platformintegration/testing/testingplatform.cpp
+    HEADERS += platformintegration/testing/testingplatform.h
+    RESOURCES += platformintegration/testing/testui.qrc
+    DEFINES += ENABLE_TESTING
+    QT += qml quick
+}
+
+INSTALLS += target systemd
+
+systemd.files = $${TARGET}.service
+systemd.path = /usr/lib/systemd/user
+
+# Default rules for deployment.
+target.path = /usr/bin
+
+RESOURCES += \
+    libpebble/jskit/jsfiles.qrc
+
+=======
 QT += core bluetooth dbus network contacts qml location organizer websockets
 QT -= gui
 
@@ -146,3 +290,4 @@ QMAKE_POST_LINK = sed -i s/@VERSION@/$$VERSION/g $$OUT_PWD/../manifest.json || e
 
 RESOURCES += \
     libpebble/jskit/jsfiles.qrc
+>>>>>>> refs/heads/rockwork