diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-22 19:17:53 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-22 19:49:07 +0200 |
| commit | c2c141ed1e13e6f0fbc740d0ff37caba0b2a7c08 (patch) | |
| tree | a7892e105c85c7d4a32d3b3202e60ec2131e42c8 /app/app.pro | |
| parent | c9c1ed9faee07c0067827872ffe465d465c81470 (diff) | |
| parent | 9f8db04d6059e0b220e36a064d694a1b0649f5f0 (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/daemon.cpp
daemon/manager.cpp
daemon/manager.h
Diffstat (limited to 'app/app.pro')
| -rw-r--r-- | app/app.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/app.pro b/app/app.pro index 48aff06..cb4c33b 100644 --- a/app/app.pro +++ b/app/app.pro @@ -5,6 +5,8 @@ CONFIG += sailfishapp QT += dbus QMAKE_CXXFLAGS += -std=c++0x +DEFINES += APP_VERSION=\\\"$$VERSION\\\" + SOURCES += \ pebble.cpp \ pebbledinterface.cpp @@ -16,6 +18,8 @@ OTHER_FILES += \ qml/cover/CoverPage.qml \ qml/pages/ManagerPage.qml \ qml/pages/WatchPage.qml \ + qml/pages/AboutPage.qml \ qml/pebble.qml \ + qml/images/* \ pebble.desktop \ pebble.png |