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

1 files changed, 9 insertions, 3 deletions

diff --git a/app/pebble.cpp b/app/pebble.cpp
index 44f1aeb..41da080 100644
--- a/app/pebble.cpp
+++ b/app/pebble.cpp
@@ -33,16 +33,22 @@
 
 #include <sailfishapp.h>
 #include "pebbledinterface.h"
+#include "pebbleappiconprovider.h"
 
 int main(int argc, char *argv[])
 {
-    // Register Pebble daemon interface object on QML side
-    qmlRegisterType<PebbledInterface>("org.pebbled", 0, 1, "PebbledInterface");
-
     QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
 
+    qmlRegisterUncreatableType<PebbledInterface>("org.pebbled", 0, 1, "PebbledInterface",
+                                                 "Please use pebbled context property");
+
     QScopedPointer<QQuickView> view(SailfishApp::createView());
+    QScopedPointer<PebbledInterface> pebbled(new PebbledInterface);
+    QScopedPointer<PebbleAppIconProvider> appicons(new PebbleAppIconProvider(pebbled.data()));
+
     view->rootContext()->setContextProperty("APP_VERSION", APP_VERSION);
+    view->rootContext()->setContextProperty("pebbled", pebbled.data());
+    view->engine()->addImageProvider("pebble-app-icon", appicons.data());
     view->setSource(SailfishApp::pathTo("qml/pebble.qml"));
     view->show();