From d31346c047413cc244056d114488c51564f0b593 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Mon, 18 Dec 2017 16:15:06 -0300
Subject: [PATCH] Use qml engine

---
 .../resources/qml/hifi/+android/Desktop.qml   | 63 +++++++++++++++++++
 libraries/ui/src/OffscreenQmlElement.h        |  2 +-
 .../ui/src/ui/TabletScriptingInterface.cpp    |  2 +-
 3 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 interface/resources/qml/hifi/+android/Desktop.qml

diff --git a/interface/resources/qml/hifi/+android/Desktop.qml b/interface/resources/qml/hifi/+android/Desktop.qml
new file mode 100644
index 0000000000..99d792b664
--- /dev/null
+++ b/interface/resources/qml/hifi/+android/Desktop.qml
@@ -0,0 +1,63 @@
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+
+import Qt.labs.settings 1.0
+
+import "../desktop" as OriginalDesktop
+import ".."
+import "."
+import "./toolbars"
+
+OriginalDesktop.Desktop {
+    id: desktop
+
+    MouseArea {
+        id: hoverWatch
+        anchors.fill: parent
+        hoverEnabled: true
+        propagateComposedEvents: true
+        scrollGestureEnabled: false // we don't need/want these
+        onEntered: ApplicationCompositor.reticleOverDesktop = true
+        onExited: ApplicationCompositor.reticleOverDesktop = false
+        acceptedButtons: Qt.NoButton
+		
+
+    }
+
+
+    Component { id: toolbarBuilder; Toolbar { } }
+    // This used to create sysToolbar dynamically with a call to getToolbar() within onCompleted.
+    // Beginning with QT 5.6, this stopped working, as anything added to toolbars too early got
+    // wiped during startup.
+    Toolbar {
+        id: sysToolbar;
+        objectName: "com.highfidelity.interface.toolbar.system";
+        // Magic: sysToolbar.x and y come from settings, and are bound before the properties specified here are applied.
+        x: sysToolbar.x;
+        y: sysToolbar.y;
+    }
+    property var toolbars: (function (map) { // answer dictionary preloaded with sysToolbar
+        map[sysToolbar.objectName] = sysToolbar;
+        return map; })({});
+
+    Component.onCompleted: {
+    }
+
+    // Accept a download through the webview
+    property bool webViewProfileSetup: false
+    property string currentUrl: ""
+    property string adaptedPath: ""
+    property string tempDir: ""
+
+    // Create or fetch a toolbar with the given name
+    function getToolbar(name) {
+        var result = toolbars[name];
+        if (!result) {
+            result = toolbars[name] = toolbarBuilder.createObject(desktop, {});
+            result.objectName = name;
+        }
+        return result;
+    }
+}
+
+
diff --git a/libraries/ui/src/OffscreenQmlElement.h b/libraries/ui/src/OffscreenQmlElement.h
index 4e07fcccd9..3597add964 100644
--- a/libraries/ui/src/OffscreenQmlElement.h
+++ b/libraries/ui/src/OffscreenQmlElement.h
@@ -40,7 +40,7 @@ public: \
 private:
 
 #define HIFI_QML_DEF(x) \
-    const QUrl x::QML = QUrl(#x ".qml"); \
+    const QUrl x::QML = QUrl("qrc:///qml/" #x ".qml"); \
     const QString x::NAME = #x; \
     \
     void x::registerType() { \
diff --git a/libraries/ui/src/ui/TabletScriptingInterface.cpp b/libraries/ui/src/ui/TabletScriptingInterface.cpp
index 0e793fef21..6e86d75940 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.cpp
+++ b/libraries/ui/src/ui/TabletScriptingInterface.cpp
@@ -268,7 +268,7 @@ static const char* WEB_VIEW_SOURCE_URL = "hifi/tablet/TabletWebView.qml";
 static const char* VRMENU_SOURCE_URL = "hifi/tablet/TabletMenu.qml";
 
 class TabletRootWindow : public QmlWindowClass {
-    virtual QString qmlSource() const override { return "hifi/tablet/WindowRoot.qml"; }
+    virtual QString qmlSource() const override { return "qrc:///qml/hifi/tablet/WindowRoot.qml"; }
 };
 
 TabletProxy::TabletProxy(QObject* parent, const QString& name) : QObject(parent), _name(name) {