From e8ad1c9c993a98cdeea92dfcec29052654ec807d Mon Sep 17 00:00:00 2001
From: Tomasz Sterna <tomek@xiaoka.com>
Date: Sun, 20 Jul 2014 21:48:03 +0200
Subject: Added VERSION to app and daemon

---
 app/app.pro    | 2 ++
 app/pebble.cpp | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/app.pro b/app/app.pro
index 48aff06..c0fe5d3 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
diff --git a/app/pebble.cpp b/app/pebble.cpp
index b2f4d09..44f1aeb 100644
--- a/app/pebble.cpp
+++ b/app/pebble.cpp
@@ -39,6 +39,13 @@ int main(int argc, char *argv[])
     // Register Pebble daemon interface object on QML side
     qmlRegisterType<PebbledInterface>("org.pebbled", 0, 1, "PebbledInterface");
 
-    return SailfishApp::main(argc, argv);
+    QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
+
+    QScopedPointer<QQuickView> view(SailfishApp::createView());
+    view->rootContext()->setContextProperty("APP_VERSION", APP_VERSION);
+    view->setSource(SailfishApp::pathTo("qml/pebble.qml"));
+    view->show();
+
+    return app->exec();
 }
 
-- 
cgit v1.2.3