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/qml/xmlhttprequest/main.cpp           | 2 +-
 examples/qml/xmlhttprequest/xmlhttprequest.pro | 7 ++++---
 examples/qml/xmlhttprequest/xmlhttprequest.qrc | 7 +++++++
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 examples/qml/xmlhttprequest/xmlhttprequest.qrc

(limited to 'examples/qml')

diff --git a/examples/qml/xmlhttprequest/main.cpp b/examples/qml/xmlhttprequest/main.cpp
index 25f3759de5..8bf39fcf62 100644
--- a/examples/qml/xmlhttprequest/main.cpp
+++ b/examples/qml/xmlhttprequest/main.cpp
@@ -38,4 +38,4 @@
 **
 ****************************************************************************/
 #include "../../quick/shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(xmlhttprequest)
+DECLARATIVE_EXAMPLE_MAIN(qml/xmlhttprequest/xmlhttprequest)
diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.pro b/examples/qml/xmlhttprequest/xmlhttprequest.pro
index 5af32eeab6..3e20d3781c 100644
--- a/examples/qml/xmlhttprequest/xmlhttprequest.pro
+++ b/examples/qml/xmlhttprequest/xmlhttprequest.pro
@@ -2,11 +2,12 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += \
+    xmlhttprequest.qrc \
+    ../../quick/shared/quick_shared.qrc
 
 EXAMPLE_FILES = \
     data.xml
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qml/xmlhttprequest
-qml.files = xmlhttprequest.qml get.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qml/xmlhttprequest
-INSTALLS += target qml
+INSTALLS += target
diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.qrc b/examples/qml/xmlhttprequest/xmlhttprequest.qrc
new file mode 100644
index 0000000000..532e508a90
--- /dev/null
+++ b/examples/qml/xmlhttprequest/xmlhttprequest.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/qml/xmlhttprequest">
+        <file>xmlhttprequest.qml</file>
+        <file>get.qml</file>
+        <file>data.xml</file>
+    </qresource>
+</RCC>
-- 
cgit v1.2.3