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/customitems | |
| 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/customitems')
5 files changed, 21 insertions, 7 deletions
diff --git a/examples/quick/customitems/maskedmousearea/main.cpp b/examples/quick/customitems/maskedmousearea/main.cpp index a0ca0b6db7..a0235fc4d4 100644 --- a/examples/quick/customitems/maskedmousearea/main.cpp +++ b/examples/quick/customitems/maskedmousearea/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char* argv[]) qmlRegisterType<MaskedMouseArea>("Example", 1, 0, "MaskedMouseArea"); - view.setSource(QUrl::fromLocalFile("maskedmousearea.qml")); + view.setSource(QUrl("qrc:///customitems/maskedmousearea/maskedmousearea.qml")); view.show(); return app.exec(); } diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro index d44fa59d08..fe5c05ce61 100644 --- a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro +++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro @@ -7,7 +7,7 @@ HEADERS += maskedmousearea.h SOURCES += main.cpp \ maskedmousearea.cpp +RESOURCES += maskedmousearea.qrc + target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/maskedmousearea -qml.files = maskedmousearea.qml images -qml.path = $$target.path -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.qrc b/examples/quick/customitems/maskedmousearea/maskedmousearea.qrc new file mode 100644 index 0000000000..3cc3955e56 --- /dev/null +++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.qrc @@ -0,0 +1,8 @@ +<RCC> + <qresource prefix="/customitems/maskedmousearea"> + <file>maskedmousearea.qml</file> + <file>images/cloud_1.png</file> + <file>images/cloud_2.png</file> + <file>images/moon.png</file> + </qresource> +</RCC> diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro index dfe6f96923..8f94a0cecd 100644 --- a/examples/quick/customitems/painteditem/painteditem.pro +++ b/examples/quick/customitems/painteditem/painteditem.pro @@ -9,12 +9,12 @@ HEADERS += TextBalloonPlugin/plugin.h \ SOURCES += textballoon.cpp +RESOURCES += painteditem.qrc + DESTDIR = TextBalloonPlugin target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin qmldir.files = TextBalloonPlugin/qmldir qmldir.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin -qml.files = textballoons.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/ -INSTALLS += qml qmldir target +INSTALLS += qmldir target diff --git a/examples/quick/customitems/painteditem/painteditem.qrc b/examples/quick/customitems/painteditem/painteditem.qrc new file mode 100644 index 0000000000..c240be02a1 --- /dev/null +++ b/examples/quick/customitems/painteditem/painteditem.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/painteditem"> + <file>textballoon.h</file> + <file>textballoons.qml</file> + </qresource> +</RCC> |