From a0fb0a5dd32b031f89abe603ed07a50c74327e37 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Tue, 11 Dec 2012 14:17:34 +0100
Subject: Use resource files for most examples

Make examples shadow-build-friendly by using resource
files instead of trying to derive the qml path from
applicationDirPath().

Change-Id: I669424554c772d9b261249b366247190f5fbd8b1
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
---
 examples/quick/scenegraph/customgeometry/customgeometry.pro | 7 +++----
 examples/quick/scenegraph/customgeometry/customgeometry.qrc | 5 +++++
 examples/quick/scenegraph/customgeometry/main.cpp           | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 examples/quick/scenegraph/customgeometry/customgeometry.qrc

(limited to 'examples/quick/scenegraph/customgeometry')

diff --git a/examples/quick/scenegraph/customgeometry/customgeometry.pro b/examples/quick/scenegraph/customgeometry/customgeometry.pro
index 8044c5c034..17c30fc560 100644
--- a/examples/quick/scenegraph/customgeometry/customgeometry.pro
+++ b/examples/quick/scenegraph/customgeometry/customgeometry.pro
@@ -8,8 +8,7 @@ SOURCES += \
 HEADERS += \
     beziercurve.h
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/customgeometry
-qml.files = main.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/customgeometry
+RESOURCES += customgeometry.qrc
 
-INSTALLS += target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/customgeometry
+INSTALLS += target
diff --git a/examples/quick/scenegraph/customgeometry/customgeometry.qrc b/examples/quick/scenegraph/customgeometry/customgeometry.qrc
new file mode 100644
index 0000000000..39080c5414
--- /dev/null
+++ b/examples/quick/scenegraph/customgeometry/customgeometry.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/scenegraph/customgeometry">
+        <file>main.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/scenegraph/customgeometry/main.cpp b/examples/quick/scenegraph/customgeometry/main.cpp
index 6cb2b0e153..ea699c1c36 100644
--- a/examples/quick/scenegraph/customgeometry/main.cpp
+++ b/examples/quick/scenegraph/customgeometry/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
     qmlRegisterType<BezierCurve>("CustomGeometry", 1, 0, "BezierCurve");
 
     QQuickView view;
-    view.setSource(QUrl("main.qml"));
+    view.setSource(QUrl("qrc:///scenegraph/customgeometry/main.qml"));
     view.show();
 
     app.exec();
-- 
cgit v1.2.3