From 396a01b4748decf4080add69471ee846a3d2dc46 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 12 Feb 2014 12:27:31 +0200
Subject: Take qml_plugin.prf into use
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enables us to lose a bunch of hacks.

Change-Id: Id7641012004428aa9782cfb5dbaf9fc9c4629706
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 examples/qmlsurfacelayers/main.cpp                  | 21 +++++++++++----------
 .../qmlsurfacelayers/qml/qmlsurfacelayers/main.qml  |  8 ++++----
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'examples/qmlsurfacelayers')

diff --git a/examples/qmlsurfacelayers/main.cpp b/examples/qmlsurfacelayers/main.cpp
index 51925c45..434008c4 100644
--- a/examples/qmlsurfacelayers/main.cpp
+++ b/examples/qmlsurfacelayers/main.cpp
@@ -16,14 +16,11 @@
 **
 ****************************************************************************/
 
-#include <QtDataVisualization/qutils.h>
-#include <QtGui/QGuiApplication>
 #include "qtquick2applicationviewer.h"
+#include <QtDataVisualization/qutils.h>
 
-#ifdef Q_OS_ANDROID
-#include <QDir>
-#include <QQmlEngine>
-#endif
+#include <QtGui/QGuiApplication>
+#include <QtCore/QDir>
 
 int main(int argc, char *argv[])
 {
@@ -34,10 +31,14 @@ int main(int argc, char *argv[])
     // Enable antialiasing
     viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());
 
-#ifdef Q_OS_ANDROID
-    viewer.addImportPath(QString::fromLatin1("assets:/qml"));
-    viewer.engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(),
-                                                                       QString::fromLatin1("lib")));
+    // The following are needed to make examples run without having to install the module
+    // in desktop environments.
+#ifdef Q_OS_WIN
+    viewer.addImportPath(QString::fromLatin1("%1/../../../%2").arg(QGuiApplication::applicationDirPath(),
+                                                               QString::fromLatin1("qml")));
+#else
+    viewer.addImportPath(QString::fromLatin1("%1/../../%2").arg(QGuiApplication::applicationDirPath(),
+                                                               QString::fromLatin1("qml")));
 #endif
 
     viewer.setSource(QUrl("qrc:/qml/qmlsurfacelayers/main.qml"));
diff --git a/examples/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml b/examples/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
index ba9961b5..22c527a2 100644
--- a/examples/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
+++ b/examples/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
@@ -204,12 +204,12 @@ Item {
                 if (surfaceLayers.selectionMode & AbstractGraph3D.SelectionMultiSeries) {
                     surfaceLayers.selectionMode = AbstractGraph3D.SelectionRow
                             | AbstractGraph3D.SelectionSlice
-                    text: "Slice All Layers"
+                    text = "Slice All Layers"
                 } else {
                     surfaceLayers.selectionMode = AbstractGraph3D.SelectionRow
                             | AbstractGraph3D.SelectionSlice
                             | AbstractGraph3D.SelectionMultiSeries
-                    text: "Slice One Layer"
+                    text = "Slice One Layer"
                 }
             }
         }
@@ -223,10 +223,10 @@ Item {
             onClicked: {
                 if (surfaceLayers.shadowQuality === AbstractGraph3D.ShadowQualityNone) {
                     surfaceLayers.shadowQuality = AbstractGraph3D.ShadowQualityLow
-                    text: "Hide Shadows"
+                    text = "Hide Shadows"
                 } else {
                     surfaceLayers.shadowQuality = AbstractGraph3D.ShadowQualityNone
-                    text: "Show Shadows"
+                    text = "Show Shadows"
                 }
             }
         }
-- 
cgit v1.2.3