summaryrefslogtreecommitdiffstats
path: root/examples/qml
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2012-12-11 14:17:34 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-12 10:32:50 +0100
commita0fb0a5dd32b031f89abe603ed07a50c74327e37 (patch)
tree04dd8b801c1e5daca81701542a8f6815c8b35274 /examples/qml
parentb570d384c0704ea12364e353493eeb6f1ae34cd3 (diff)
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>
Diffstat (limited to 'examples/qml')
-rw-r--r--examples/qml/xmlhttprequest/main.cpp2
-rw-r--r--examples/qml/xmlhttprequest/xmlhttprequest.pro7
-rw-r--r--examples/qml/xmlhttprequest/xmlhttprequest.qrc7
3 files changed, 12 insertions, 4 deletions
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>