diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:29:47 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-12 09:30:49 +0200 |
| commit | 2101baf2911d7965c86e5308e4d8350790a6956c (patch) | |
| tree | 2acb875cabca055797620458baad26d5f8612105 /app/app.pro | |
| parent | 959e251f2336e21d3615b1525a38773fe58ab2e7 (diff) | |
| parent | 84e775d768f0675ee733132b3762db647f1409ac (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/manager.cpp
Diffstat (limited to 'app/app.pro')
| -rw-r--r-- | app/app.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/app.pro b/app/app.pro index 40a4a1d..48aff06 100644 --- a/app/app.pro +++ b/app/app.pro @@ -2,6 +2,9 @@ TARGET = pebble CONFIG += sailfishapp +QT += dbus +QMAKE_CXXFLAGS += -std=c++0x + SOURCES += \ pebble.cpp \ pebbledinterface.cpp @@ -9,9 +12,6 @@ SOURCES += \ HEADERS += \ pebbledinterface.h -QT += dbus -QMAKE_CXXFLAGS += -std=c++0x - OTHER_FILES += \ qml/cover/CoverPage.qml \ qml/pages/ManagerPage.qml \ |