diff options
| author | Tomasz Sterna <tomek@xiaoka.com> | 2015-01-03 16:38:02 +0100 |
|---|---|---|
| committer | Tomasz Sterna <tomek@xiaoka.com> | 2015-01-03 19:07:48 +0100 |
| commit | 4e7da1944f5fa75a0739c0757d40a8102f045365 (patch) | |
| tree | 5f3fe179256536e4135eb4d5031a1d754af5e26c /daemon/daemon.pro | |
| parent | 4150005566bec7827ce1cdd759a2397d47eba583 (diff) | |
| parent | e6ec758b364fcaf9fda35e56740c3fcd7e8fe25e (diff) | |
Merge remote-tracking branch 'javispedro/js-testing'
Conflicts:
daemon/daemon.pro
daemon/dbusconnector.cpp
daemon/manager.cpp
daemon/watchcommands.cpp
daemon/watchcommands.h
daemon/watchconnector.cpp
daemon/watchconnector.h
log4qt-debug.conf
log4qt-release.conf
rpm/pebble.spec
rpm/pebble.yaml
Diffstat (limited to 'daemon/daemon.pro')
| -rw-r--r-- | daemon/daemon.pro | 54 |
1 files changed, 38 insertions, 16 deletions
diff --git a/daemon/daemon.pro b/daemon/daemon.pro index 85705aa..1c287d0 100644 --- a/daemon/daemon.pro +++ b/daemon/daemon.pro @@ -2,13 +2,10 @@ TARGET = pebbled CONFIG += console CONFIG += link_pkgconfig -QT -= gui -QT += core bluetooth dbus contacts -PKGCONFIG += mlite5 -QMAKE_CXXFLAGS += -std=c++0x - -LIBS += -licuuc -licui18n +QT += core gui qml bluetooth dbus contacts positioning +PKGCONFIG += mlite5 icu-i18n +CONFIG += c++11 DEFINES += APP_VERSION=\\\"$$VERSION\\\" @@ -20,8 +17,18 @@ SOURCES += \ notificationmanager.cpp \ watchconnector.cpp \ dbusconnector.cpp \ - dbusadaptor.cpp \ - watchcommands.cpp + appmanager.cpp \ + musicmanager.cpp \ + datalogmanager.cpp \ + unpacker.cpp \ + appmsgmanager.cpp \ + jskitmanager.cpp \ + appinfo.cpp \ + jskitobjects.cpp \ + packer.cpp \ + bankmanager.cpp \ + uploadmanager.cpp \ + stm32crc.cpp HEADERS += \ manager.h \ @@ -30,19 +37,34 @@ HEADERS += \ notificationmanager.h \ watchconnector.h \ dbusconnector.h \ - dbusadaptor.h \ - watchcommands.h \ - settings.h + settings.h \ + appmanager.h \ + musicmanager.h \ + unpacker.h \ + datalogmanager.h \ + appmsgmanager.h \ + jskitmanager.h \ + appinfo.h \ + jskitobjects.h \ + packer.h \ + bankmanager.h \ + uploadmanager.h \ + stm32crc.h + +DBUS_ADAPTORS += ../org.pebbled.Watch.xml -OTHER_FILES += \ - org.pebbled.xml +OTHER_FILES += $$DBUS_ADAPTORS \ + js/typedarray.js -INSTALLS += target pebbled +INSTALLS += target systemd js target.path = /usr/bin -pebbled.files = $${TARGET}.service -pebbled.path = /usr/lib/systemd/user +systemd.files = $${TARGET}.service +systemd.path = /usr/lib/systemd/user + +js.files = js/* +js.path = /usr/share/pebble/js # unnecesary includes, just so QtCreator could find headers... :-( INCLUDEPATH += $$[QT_HOST_PREFIX]/include/mlite5 |