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 /daemon/daemon.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 'daemon/daemon.pro')
| -rw-r--r-- | daemon/daemon.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/daemon/daemon.pro b/daemon/daemon.pro index fb10771..df7b887 100644 --- a/daemon/daemon.pro +++ b/daemon/daemon.pro @@ -12,6 +12,8 @@ LIBS += -L$$OUT_PWD/../ext/Log4Qt/ -llog4qt QMAKE_RPATHDIR += /usr/share/pebble/lib INCLUDEPATH += ../ext/Log4Qt/src ../ext/Log4Qt/deploy/include +DEFINES += APP_VERSION=\\\"$$VERSION\\\" + SOURCES += \ daemon.cpp \ manager.cpp \ |