diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2012-12-11 14:17:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-12 10:32:50 +0100 |
| commit | a0fb0a5dd32b031f89abe603ed07a50c74327e37 (patch) | |
| tree | 04dd8b801c1e5daca81701542a8f6815c8b35274 /examples/quick/scenegraph | |
| parent | b570d384c0704ea12364e353493eeb6f1ae34cd3 (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/quick/scenegraph')
9 files changed, 24 insertions, 10 deletions
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(); diff --git a/examples/quick/scenegraph/openglunderqml/main.cpp b/examples/quick/scenegraph/openglunderqml/main.cpp index c5a68e83b1..adc389cb4c 100644 --- a/examples/quick/scenegraph/openglunderqml/main.cpp +++ b/examples/quick/scenegraph/openglunderqml/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char **argv) qmlRegisterType<Squircle>("OpenGLUnderQML", 1, 0, "Squircle"); QQuickView view; - view.setSource(QUrl("main.qml")); + view.setSource(QUrl("qrc:///scenegraph/openglunderqml/main.qml")); view.show(); return app.exec(); diff --git a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro index f86dd5f5f3..54558ce9e9 100644 --- a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro +++ b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro @@ -2,8 +2,7 @@ QT += qml quick HEADERS += squircle.h SOURCES += squircle.cpp main.cpp +RESOURCES += openglunderqml.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/openglunderqml -qml.files = main.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/openglunderqml -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/scenegraph/openglunderqml/openglunderqml.qrc b/examples/quick/scenegraph/openglunderqml/openglunderqml.qrc new file mode 100644 index 0000000000..d166ea9d37 --- /dev/null +++ b/examples/quick/scenegraph/openglunderqml/openglunderqml.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/scenegraph/openglunderqml"> + <file>main.qml</file> + </qresource> +</RCC> diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.cpp b/examples/quick/scenegraph/simplematerial/simplematerial.cpp index de5ae9ebda..b7bea08260 100644 --- a/examples/quick/scenegraph/simplematerial/simplematerial.cpp +++ b/examples/quick/scenegraph/simplematerial/simplematerial.cpp @@ -185,7 +185,7 @@ int main(int argc, char **argv) qmlRegisterType<Item>("SimpleMaterial", 1, 0, "SimpleMaterialItem"); QQuickView view; - view.setSource(QUrl("main.qml")); + view.setSource(QUrl("qrc:///scenegraph/simplematerial/main.qml")); view.show(); return app.exec(); diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.pro b/examples/quick/scenegraph/simplematerial/simplematerial.pro index ae4fb0fdd0..6ae935f357 100644 --- a/examples/quick/scenegraph/simplematerial/simplematerial.pro +++ b/examples/quick/scenegraph/simplematerial/simplematerial.pro @@ -3,6 +3,7 @@ QT += quick SOURCES += \ simplematerial.cpp +RESOURCES += simplematerial.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial qml.files = main.qml diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.qrc b/examples/quick/scenegraph/simplematerial/simplematerial.qrc new file mode 100644 index 0000000000..4cc1eaafe4 --- /dev/null +++ b/examples/quick/scenegraph/simplematerial/simplematerial.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/scenegraph/simplematerial"> + <file>main.qml</file> + </qresource> +</RCC> |