From a0fb0a5dd32b031f89abe603ed07a50c74327e37 Mon Sep 17 00:00:00 2001 From: Kai Koehne 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 --- examples/qml/xmlhttprequest/main.cpp | 2 +- examples/qml/xmlhttprequest/xmlhttprequest.pro | 7 ++- examples/qml/xmlhttprequest/xmlhttprequest.qrc | 7 +++ examples/quick/accessibility/accessibility.pro | 5 +- examples/quick/accessibility/accessibility.qrc | 8 +++ examples/quick/accessibility/main.cpp | 2 +- examples/quick/animation/animation.pro | 9 +-- examples/quick/animation/animation.qrc | 22 +++++++ examples/quick/animation/main.cpp | 2 +- examples/quick/canvas/canvas.pro | 7 ++- examples/quick/canvas/canvas.qrc | 32 ++++++++++ examples/quick/canvas/main.cpp | 2 +- .../quick/customitems/maskedmousearea/main.cpp | 2 +- .../maskedmousearea/maskedmousearea.pro | 6 +- .../maskedmousearea/maskedmousearea.qrc | 8 +++ .../quick/customitems/painteditem/painteditem.pro | 6 +- .../quick/customitems/painteditem/painteditem.qrc | 6 ++ examples/quick/demos/calqlatr/calqlatr.pro | 7 ++- examples/quick/demos/calqlatr/calqlatr.qrc | 22 +++++++ examples/quick/demos/calqlatr/main.cpp | 2 +- examples/quick/demos/maroon/main.cpp | 2 +- examples/quick/demos/maroon/maroon.pro | 5 +- examples/quick/demos/maroon/maroon.qrc | 71 +++++++++++++++++++++ examples/quick/demos/samegame/main.cpp | 2 +- examples/quick/demos/samegame/samegame.pro | 5 +- examples/quick/demos/samegame/samegame.qrc | 72 ++++++++++++++++++++++ examples/quick/demos/stocqt/main.cpp | 2 +- examples/quick/demos/stocqt/stocqt.pro | 5 +- examples/quick/demos/stocqt/stocqt.qrc | 21 +++++++ examples/quick/demos/tweetsearch/main.cpp | 2 +- examples/quick/demos/tweetsearch/tweetsearch.pro | 5 +- examples/quick/demos/tweetsearch/tweetsearch.qrc | 19 ++++++ examples/quick/draganddrop/draganddrop.pro | 7 ++- examples/quick/draganddrop/draganddrop.qrc | 9 +++ examples/quick/draganddrop/main.cpp | 2 +- examples/quick/imageelements/imageelements.pro | 7 ++- examples/quick/imageelements/imageelements.qrc | 23 +++++++ examples/quick/imageelements/main.cpp | 2 +- examples/quick/keyinteraction/keyinteraction.pro | 5 +- examples/quick/keyinteraction/keyinteraction.qrc | 12 ++++ examples/quick/keyinteraction/main.cpp | 2 +- .../localstorage/localstorage/localstorage.pro | 7 ++- .../localstorage/localstorage/localstorage.qrc | 6 ++ examples/quick/localstorage/localstorage/main.cpp | 2 +- examples/quick/mousearea/main.cpp | 2 +- examples/quick/mousearea/mousearea.pro | 5 +- examples/quick/mousearea/mousearea.qrc | 6 ++ examples/quick/particles/affectors/affectors.pro | 8 ++- examples/quick/particles/affectors/affectors.qrc | 16 +++++ examples/quick/particles/affectors/main.cpp | 2 +- .../particles/customparticle/customparticle.pro | 9 ++- .../particles/customparticle/customparticle.qrc | 8 +++ examples/quick/particles/customparticle/main.cpp | 2 +- examples/quick/particles/emitters/emitters.pro | 8 ++- examples/quick/particles/emitters/emitters.qrc | 12 ++++ examples/quick/particles/emitters/main.cpp | 2 +- .../particles/imageparticle/imageparticle.pro | 8 ++- .../particles/imageparticle/imageparticle.qrc | 12 ++++ examples/quick/particles/imageparticle/main.cpp | 2 +- examples/quick/particles/images.qrc | 38 ++++++++++++ examples/quick/particles/system/main.cpp | 2 +- examples/quick/particles/system/system.pro | 8 ++- examples/quick/particles/system/system.qrc | 10 +++ examples/quick/positioners/main.cpp | 2 +- examples/quick/positioners/positioners.pro | 7 ++- examples/quick/positioners/positioners.qrc | 7 +++ examples/quick/righttoleft/main.cpp | 2 +- examples/quick/righttoleft/righttoleft.pro | 7 ++- examples/quick/righttoleft/righttoleft.qrc | 8 +++ .../scenegraph/customgeometry/customgeometry.pro | 7 +-- .../scenegraph/customgeometry/customgeometry.qrc | 5 ++ examples/quick/scenegraph/customgeometry/main.cpp | 2 +- examples/quick/scenegraph/openglunderqml/main.cpp | 2 +- .../scenegraph/openglunderqml/openglunderqml.pro | 5 +- .../scenegraph/openglunderqml/openglunderqml.qrc | 5 ++ .../scenegraph/simplematerial/simplematerial.cpp | 2 +- .../scenegraph/simplematerial/simplematerial.pro | 1 + .../scenegraph/simplematerial/simplematerial.qrc | 5 ++ examples/quick/shadereffects/main.cpp | 2 +- examples/quick/shadereffects/shadereffects.pro | 5 +- examples/quick/shadereffects/shadereffects.qrc | 8 +++ examples/quick/shared/quick_shared.qrc | 8 +++ examples/quick/shared/shared.h | 26 +------- examples/quick/shared/shared.qrc | 8 +++ examples/quick/text/main.cpp | 2 +- examples/quick/text/text.pro | 7 ++- examples/quick/text/text.qrc | 24 ++++++++ examples/quick/threading/main.cpp | 2 +- examples/quick/threading/threading.pro | 7 ++- examples/quick/threading/threading.qrc | 10 +++ examples/quick/touchinteraction/main.cpp | 2 +- .../quick/touchinteraction/touchinteraction.pro | 7 ++- .../quick/touchinteraction/touchinteraction.qrc | 27 ++++++++ examples/quick/views/main.cpp | 2 +- examples/quick/views/views.pro | 15 ++--- examples/quick/views/views.qrc | 69 +++++++++++++++++++++ examples/quick/window/window/window.cpp | 2 +- examples/quick/window/window/window.pro | 6 +- examples/quick/window/window/window.qrc | 5 ++ 99 files changed, 770 insertions(+), 160 deletions(-) create mode 100644 examples/qml/xmlhttprequest/xmlhttprequest.qrc create mode 100644 examples/quick/accessibility/accessibility.qrc create mode 100644 examples/quick/animation/animation.qrc create mode 100644 examples/quick/canvas/canvas.qrc create mode 100644 examples/quick/customitems/maskedmousearea/maskedmousearea.qrc create mode 100644 examples/quick/customitems/painteditem/painteditem.qrc create mode 100644 examples/quick/demos/calqlatr/calqlatr.qrc create mode 100644 examples/quick/demos/maroon/maroon.qrc create mode 100644 examples/quick/demos/samegame/samegame.qrc create mode 100644 examples/quick/demos/stocqt/stocqt.qrc create mode 100644 examples/quick/demos/tweetsearch/tweetsearch.qrc create mode 100644 examples/quick/draganddrop/draganddrop.qrc create mode 100644 examples/quick/imageelements/imageelements.qrc create mode 100644 examples/quick/keyinteraction/keyinteraction.qrc create mode 100644 examples/quick/localstorage/localstorage/localstorage.qrc create mode 100644 examples/quick/mousearea/mousearea.qrc create mode 100644 examples/quick/particles/affectors/affectors.qrc create mode 100644 examples/quick/particles/customparticle/customparticle.qrc create mode 100644 examples/quick/particles/emitters/emitters.qrc create mode 100644 examples/quick/particles/imageparticle/imageparticle.qrc create mode 100644 examples/quick/particles/images.qrc create mode 100644 examples/quick/particles/system/system.qrc create mode 100644 examples/quick/positioners/positioners.qrc create mode 100644 examples/quick/righttoleft/righttoleft.qrc create mode 100644 examples/quick/scenegraph/customgeometry/customgeometry.qrc create mode 100644 examples/quick/scenegraph/openglunderqml/openglunderqml.qrc create mode 100644 examples/quick/scenegraph/simplematerial/simplematerial.qrc create mode 100644 examples/quick/shadereffects/shadereffects.qrc create mode 100644 examples/quick/shared/quick_shared.qrc create mode 100644 examples/quick/shared/shared.qrc create mode 100644 examples/quick/text/text.qrc create mode 100644 examples/quick/threading/threading.qrc create mode 100644 examples/quick/touchinteraction/touchinteraction.qrc create mode 100644 examples/quick/views/views.qrc create mode 100644 examples/quick/window/window/window.qrc (limited to 'examples') 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 @@ + + + xmlhttprequest.qml + get.qml + data.xml + + diff --git a/examples/quick/accessibility/accessibility.pro b/examples/quick/accessibility/accessibility.pro index 9658a8e70b..3f4ea644ac 100644 --- a/examples/quick/accessibility/accessibility.pro +++ b/examples/quick/accessibility/accessibility.pro @@ -2,8 +2,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += accessibility.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/accessibility -qml.files = accessibility.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/accessibility -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/accessibility/accessibility.qrc b/examples/quick/accessibility/accessibility.qrc new file mode 100644 index 0000000000..462a9a590c --- /dev/null +++ b/examples/quick/accessibility/accessibility.qrc @@ -0,0 +1,8 @@ + + + accessibility.qml + content/Button.qml + content/Checkbox.qml + content/Slider.qml + + diff --git a/examples/quick/accessibility/main.cpp b/examples/quick/accessibility/main.cpp index 51374d0493..07b2e719aa 100644 --- a/examples/quick/accessibility/main.cpp +++ b/examples/quick/accessibility/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(accessibility) +DECLARATIVE_EXAMPLE_MAIN(accessibility/accessibility) diff --git a/examples/quick/animation/animation.pro b/examples/quick/animation/animation.pro index 58e9226ea5..70d71688a4 100644 --- a/examples/quick/animation/animation.pro +++ b/examples/quick/animation/animation.pro @@ -3,8 +3,9 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/quick/animation -qml.files = animation.qml basics behaviors easing pathanimation pathinterpolator states -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/animation -INSTALLS += target qml +RESOURCES += \ + ../shared/shared.qrc \ + animation.qrc +target.path = $$[QT_INSTALL_EXAMPLES]/quick/animation +INSTALLS += target diff --git a/examples/quick/animation/animation.qrc b/examples/quick/animation/animation.qrc new file mode 100644 index 0000000000..d1217ac378 --- /dev/null +++ b/examples/quick/animation/animation.qrc @@ -0,0 +1,22 @@ + + + animation.qml + basics/images/face-smile.png + basics/images/moon.png + basics/images/shadow.png + basics/images/star.png + basics/images/sun.png + basics/color-animation.qml + basics/property-animation.qml + behaviors/behavior-example.qml + behaviors/SideRect.qml + behaviors/tvtennis.qml + behaviors/wigglytext.qml + easing/easing.qml + pathanimation/pathanimation.qml + pathinterpolator/pathinterpolator.qml + states/qt-logo.png + states/states.qml + states/transitions.qml + + diff --git a/examples/quick/animation/main.cpp b/examples/quick/animation/main.cpp index dc5b506888..28bf080c46 100644 --- a/examples/quick/animation/main.cpp +++ b/examples/quick/animation/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(animation) +DECLARATIVE_EXAMPLE_MAIN(animation/animation) diff --git a/examples/quick/canvas/canvas.pro b/examples/quick/canvas/canvas.pro index d721805abd..4c4140407b 100644 --- a/examples/quick/canvas/canvas.pro +++ b/examples/quick/canvas/canvas.pro @@ -2,8 +2,9 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + canvas.qrc \ + ../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/canvas -qml.files = canvas.qml bezierCurve clip quadraticCurveTo roundedrect smile squircle tiger contents -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/canvas -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/canvas/canvas.qrc b/examples/quick/canvas/canvas.qrc new file mode 100644 index 0000000000..06d39f3624 --- /dev/null +++ b/examples/quick/canvas/canvas.qrc @@ -0,0 +1,32 @@ + + + canvas.qml + bezierCurve/bezierCurve.qml + clip/clip.qml + contents/Button.qml + contents/qt-logo.png + contents/ScrollBar.qml + contents/Slider.qml + contents/TitleBar.qml + contents/ToolBar.qml + contents/images/button-pressed.png + contents/images/button.png + contents/images/default.svg + contents/images/gloss.png + contents/images/lineedit.png + contents/images/lineedit.sci + contents/images/quit.png + contents/images/stripes.png + contents/images/titlebar.png + contents/images/titlebar.sci + contents/images/toolbutton.png + contents/images/toolbutton.sci + quadraticCurveTo/quadraticCurveTo.qml + roundedrect/roundedrect.qml + smile/smile.qml + squircle/squircle.png + squircle/squircle.qml + tiger/tiger.js + tiger/tiger.qml + + diff --git a/examples/quick/canvas/main.cpp b/examples/quick/canvas/main.cpp index 52c62ace12..9b2fda197d 100644 --- a/examples/quick/canvas/main.cpp +++ b/examples/quick/canvas/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(canvas) \ No newline at end of file +DECLARATIVE_EXAMPLE_MAIN(canvas/canvas) 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("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 @@ + + + maskedmousearea.qml + images/cloud_1.png + images/cloud_2.png + images/moon.png + + 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 @@ + + + textballoon.h + textballoons.qml + + diff --git a/examples/quick/demos/calqlatr/calqlatr.pro b/examples/quick/demos/calqlatr/calqlatr.pro index fec0d6416b..1b002a5f27 100644 --- a/examples/quick/demos/calqlatr/calqlatr.pro +++ b/examples/quick/demos/calqlatr/calqlatr.pro @@ -3,7 +3,8 @@ TEMPLATE = app QT += qml quick SOURCES += main.cpp +RESOURCES += calqlatr.qrc \ + ../../shared/shared.qrc + target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/calqlatr -qml.files = calqlatr.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/calqlatr -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/demos/calqlatr/calqlatr.qrc b/examples/quick/demos/calqlatr/calqlatr.qrc new file mode 100644 index 0000000000..fda7d35d7e --- /dev/null +++ b/examples/quick/demos/calqlatr/calqlatr.qrc @@ -0,0 +1,22 @@ + + + calqlatr.qml + content/Button.qml + content/calculator.js + content/Display.qml + content/NumberPad.qml + content/StyleLabel.qml + content/audio/touch.wav + content/images/icon-back.png + content/images/icon-close.png + content/images/icon-settings.png + content/images/logo.png + content/images/paper-edge-left.png + content/images/paper-edge-right.png + content/images/paper-grip.png + content/images/settings-selected-a.png + content/images/settings-selected-b.png + content/images/touch-green.png + content/images/touch-white.png + + diff --git a/examples/quick/demos/calqlatr/main.cpp b/examples/quick/demos/calqlatr/main.cpp index 9000bfc7d7..65bfc97f9a 100644 --- a/examples/quick/demos/calqlatr/main.cpp +++ b/examples/quick/demos/calqlatr/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(calqlatr) +DECLARATIVE_EXAMPLE_MAIN(demos/calqlatr/calqlatr) diff --git a/examples/quick/demos/maroon/main.cpp b/examples/quick/demos/maroon/main.cpp index da2343e444..6866cf8d7b 100644 --- a/examples/quick/demos/maroon/main.cpp +++ b/examples/quick/demos/maroon/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(maroon) +DECLARATIVE_EXAMPLE_MAIN(demos/maroon/maroon) diff --git a/examples/quick/demos/maroon/maroon.pro b/examples/quick/demos/maroon/maroon.pro index e193927e72..6ca0a2bf16 100644 --- a/examples/quick/demos/maroon/maroon.pro +++ b/examples/quick/demos/maroon/maroon.pro @@ -2,8 +2,7 @@ TEMPLATE = app QT += qml quick SOURCES += main.cpp +RESOURCES += maroon.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/maroon -qml.files = maroon.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/maroon -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/demos/maroon/maroon.qrc b/examples/quick/demos/maroon/maroon.qrc new file mode 100644 index 0000000000..52c2a4e513 --- /dev/null +++ b/examples/quick/demos/maroon/maroon.qrc @@ -0,0 +1,71 @@ + + + maroon.qml + content/BuildButton.qml + content/GameCanvas.qml + content/GameOverScreen.qml + content/InfoBar.qml + content/logic.js + content/NewGameScreen.qml + content/SoundEffect.qml + content/audio/bomb-action.wav + content/audio/catch-action.wav + content/audio/catch.wav + content/audio/currency.wav + content/audio/factory-action.wav + content/audio/melee-action.wav + content/audio/projectile-action.wav + content/audio/shooter-action.wav + content/gfx/background.png + content/gfx/bomb-action.png + content/gfx/bomb-idle.png + content/gfx/bomb.png + content/gfx/button-help.png + content/gfx/button-play.png + content/gfx/catch-action.png + content/gfx/catch.png + content/gfx/cloud.png + content/gfx/currency.png + content/gfx/dialog-bomb.png + content/gfx/dialog-factory.png + content/gfx/dialog-melee.png + content/gfx/dialog-pointer.png + content/gfx/dialog-shooter.png + content/gfx/dialog.png + content/gfx/factory-action.png + content/gfx/factory-idle.png + content/gfx/factory.png + content/gfx/grid.png + content/gfx/help.png + content/gfx/lifes.png + content/gfx/logo-bubble.png + content/gfx/logo-fish.png + content/gfx/logo.png + content/gfx/melee-action.png + content/gfx/melee-idle.png + content/gfx/melee.png + content/gfx/mob-idle.png + content/gfx/mob.png + content/gfx/points.png + content/gfx/projectile-action.png + content/gfx/projectile.png + content/gfx/scores.png + content/gfx/shooter-action.png + content/gfx/shooter-idle.png + content/gfx/shooter.png + content/gfx/sunlight.png + content/gfx/text-1.png + content/gfx/text-2.png + content/gfx/text-3.png + content/gfx/text-blank.png + content/gfx/text-gameover.png + content/gfx/text-go.png + content/gfx/wave.png + content/mobs/MobBase.qml + content/towers/Bomb.qml + content/towers/Factory.qml + content/towers/Melee.qml + content/towers/Ranged.qml + content/towers/TowerBase.qml + + diff --git a/examples/quick/demos/samegame/main.cpp b/examples/quick/demos/samegame/main.cpp index 20bf7fad18..c12804ef1f 100644 --- a/examples/quick/demos/samegame/main.cpp +++ b/examples/quick/demos/samegame/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(samegame) +DECLARATIVE_EXAMPLE_MAIN(demos/samegame/samegame) diff --git a/examples/quick/demos/samegame/samegame.pro b/examples/quick/demos/samegame/samegame.pro index fec2e53018..59cacd3c8b 100644 --- a/examples/quick/demos/samegame/samegame.pro +++ b/examples/quick/demos/samegame/samegame.pro @@ -2,8 +2,7 @@ TEMPLATE = app QT += qml quick SOURCES += main.cpp +RESOURCES += samegame.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/samegame -qml.files = samegame.qml content settings.js -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/samegame -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/demos/samegame/samegame.qrc b/examples/quick/demos/samegame/samegame.qrc new file mode 100644 index 0000000000..951b9d116c --- /dev/null +++ b/examples/quick/demos/samegame/samegame.qrc @@ -0,0 +1,72 @@ + + + samegame.qml + settings.js + content/gfx/text-p1-won.png + content/gfx/background-puzzle.png + content/gfx/background.png + content/gfx/bar.png + content/gfx/blue-puzzle.png + content/gfx/blue.png + content/gfx/bubble-highscore.png + content/gfx/bubble-puzzle.png + content/gfx/but-game-1.png + content/gfx/but-game-2.png + content/gfx/but-game-3.png + content/gfx/but-game-4.png + content/gfx/but-game-new.png + content/gfx/but-menu.png + content/gfx/but-puzzle-next.png + content/gfx/but-quit.png + content/gfx/green-puzzle.png + content/gfx/green.png + content/gfx/icon-fail.png + content/gfx/icon-ok.png + content/gfx/icon-time.png + content/gfx/logo-a.png + content/gfx/logo-e.png + content/gfx/logo-g.png + content/gfx/logo-m.png + content/gfx/logo-s.png + content/gfx/logo.png + content/gfx/particle-brick.png + content/gfx/particle-paint.png + content/gfx/particle-smoke.png + content/gfx/red-puzzle.png + content/gfx/red.png + content/gfx/text-highscore-new.png + content/gfx/text-highscore.png + content/gfx/text-no-winner.png + content/gfx/text-p1-go.png + content/gfx/text-p1.png + content/gfx/text-p2-go.png + content/gfx/text-p2-won.png + content/gfx/text-p2.png + content/gfx/yellow-puzzle.png + content/gfx/yellow.png + content/levels/level0.qml + content/levels/level1.qml + content/levels/level2.qml + content/levels/level3.qml + content/levels/level4.qml + content/levels/level5.qml + content/levels/level6.qml + content/levels/level7.qml + content/levels/level8.qml + content/levels/level9.qml + content/levels/TemplateBase.qml + content/SamegameText.qml + content/SimpleBlock.qml + content/Block.qml + content/BlockEmitter.qml + content/Button.qml + content/GameArea.qml + content/LogoAnimation.qml + content/MenuEmitter.qml + content/PaintEmitter.qml + content/PrimaryPack.qml + content/PuzzleBlock.qml + content/samegame.js + content/SmokeText.qml + + diff --git a/examples/quick/demos/stocqt/main.cpp b/examples/quick/demos/stocqt/main.cpp index 779d204a24..d893aa5a04 100644 --- a/examples/quick/demos/stocqt/main.cpp +++ b/examples/quick/demos/stocqt/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(stocqt) +DECLARATIVE_EXAMPLE_MAIN(demos/stocqt/stocqt) diff --git a/examples/quick/demos/stocqt/stocqt.pro b/examples/quick/demos/stocqt/stocqt.pro index f33c4aee01..efe37cb722 100644 --- a/examples/quick/demos/stocqt/stocqt.pro +++ b/examples/quick/demos/stocqt/stocqt.pro @@ -2,8 +2,7 @@ TEMPLATE = app QT += qml quick SOURCES += main.cpp +RESOURCES += stocqt.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/stocqt -qml.files = stocqt.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/stocqt -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/demos/stocqt/stocqt.qrc b/examples/quick/demos/stocqt/stocqt.qrc new file mode 100644 index 0000000000..b2b1acaf04 --- /dev/null +++ b/examples/quick/demos/stocqt/stocqt.qrc @@ -0,0 +1,21 @@ + + + stocqt.qml + content/Button.qml + content/DatePicker.qml + content/StockChart.qml + content/StockListModel.qml + content/StockListView.qml + content/StockModel.qml + content/StockSettings.qml + content/StockView.qml + content/images/icon-calendar-anim.png + content/images/icon-calendar.png + content/images/icon-items.png + content/images/icon-settings.png + content/images/logo.png + content/images/stock-selected.png + content/images/wheel-touch.png + content/images/wheel.png + + diff --git a/examples/quick/demos/tweetsearch/main.cpp b/examples/quick/demos/tweetsearch/main.cpp index 8b1d59679c..6253bc2f6b 100644 --- a/examples/quick/demos/tweetsearch/main.cpp +++ b/examples/quick/demos/tweetsearch/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(tweetsearch) +DECLARATIVE_EXAMPLE_MAIN(demos/tweetsearch/tweetsearch) diff --git a/examples/quick/demos/tweetsearch/tweetsearch.pro b/examples/quick/demos/tweetsearch/tweetsearch.pro index 887c05af88..b063cc4106 100644 --- a/examples/quick/demos/tweetsearch/tweetsearch.pro +++ b/examples/quick/demos/tweetsearch/tweetsearch.pro @@ -2,8 +2,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += tweetsearch.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/tweetsearch -qml.files = tweetsearch.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/tweetsearch -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/demos/tweetsearch/tweetsearch.qrc b/examples/quick/demos/tweetsearch/tweetsearch.qrc new file mode 100644 index 0000000000..b23c3c5537 --- /dev/null +++ b/examples/quick/demos/tweetsearch/tweetsearch.qrc @@ -0,0 +1,19 @@ + + + tweetsearch.qml + content/FlipBar.qml + content/LineInput.qml + content/ListFooter.qml + content/ListHeader.qml + content/SearchDelegate.qml + content/TweetDelegate.qml + content/tweetsearch.js + content/TweetsModel.qml + content/resources/anonymous.png + content/resources/bird-anim-sprites.png + content/resources/icon-clear.png + content/resources/icon-loading.png + content/resources/icon-refresh.png + content/resources/icon-search.png + + diff --git a/examples/quick/draganddrop/draganddrop.pro b/examples/quick/draganddrop/draganddrop.pro index 451d03ad32..e62b936aa8 100644 --- a/examples/quick/draganddrop/draganddrop.pro +++ b/examples/quick/draganddrop/draganddrop.pro @@ -2,8 +2,9 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + draganddrop.qrc \ + ../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/draganddrop -qml.files = draganddrop.qml tiles views -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/draganddrop -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/draganddrop/draganddrop.qrc b/examples/quick/draganddrop/draganddrop.qrc new file mode 100644 index 0000000000..6d064f7722 --- /dev/null +++ b/examples/quick/draganddrop/draganddrop.qrc @@ -0,0 +1,9 @@ + + + draganddrop.qml + tiles/DragTile.qml + tiles/DropTile.qml + tiles/tiles.qml + views/gridview.qml + + diff --git a/examples/quick/draganddrop/main.cpp b/examples/quick/draganddrop/main.cpp index 7a7adf2391..d9bf43695a 100644 --- a/examples/quick/draganddrop/main.cpp +++ b/examples/quick/draganddrop/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(draganddrop) +DECLARATIVE_EXAMPLE_MAIN(draganddrop/draganddrop) diff --git a/examples/quick/imageelements/imageelements.pro b/examples/quick/imageelements/imageelements.pro index 281b44f112..4d1c6f0a95 100644 --- a/examples/quick/imageelements/imageelements.pro +++ b/examples/quick/imageelements/imageelements.pro @@ -2,8 +2,9 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + imageelements.qrc \ + ../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageelements -qml.files = *.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageelements -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/imageelements/imageelements.qrc b/examples/quick/imageelements/imageelements.qrc new file mode 100644 index 0000000000..ef8a9e52cb --- /dev/null +++ b/examples/quick/imageelements/imageelements.qrc @@ -0,0 +1,23 @@ + + + content/arrow.png + content/BearSheet.png + content/BorderImageSelector.qml + content/bw.png + content/colors-round.sci + content/colors-stretch.sci + content/colors.png + content/ImageCell.qml + content/MyBorderImage.qml + content/qt-logo.png + content/shadow.png + content/ShadowRectangle.qml + content/speaker.png + imageelements.qml + animatedsprite.qml + borderimage.qml + image.qml + shadows.qml + spritesequence.qml + + diff --git a/examples/quick/imageelements/main.cpp b/examples/quick/imageelements/main.cpp index aa624e2229..ab7d5215fa 100644 --- a/examples/quick/imageelements/main.cpp +++ b/examples/quick/imageelements/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(imageelements) +DECLARATIVE_EXAMPLE_MAIN(imageelements/imageelements) diff --git a/examples/quick/keyinteraction/keyinteraction.pro b/examples/quick/keyinteraction/keyinteraction.pro index a0c65be2d1..edc157f028 100644 --- a/examples/quick/keyinteraction/keyinteraction.pro +++ b/examples/quick/keyinteraction/keyinteraction.pro @@ -2,8 +2,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += keyinteraction.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/keyinteraction -qml.files = keyinteraction.qml focus -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/keyinteraction -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/keyinteraction/keyinteraction.qrc b/examples/quick/keyinteraction/keyinteraction.qrc new file mode 100644 index 0000000000..21bde4472c --- /dev/null +++ b/examples/quick/keyinteraction/keyinteraction.qrc @@ -0,0 +1,12 @@ + + + keyinteraction.qml + focus/focus.qml + focus/Core/images/arrow.png + focus/Core/images/qt-logo.png + focus/Core/ContextMenu.qml + focus/Core/GridMenu.qml + focus/Core/ListMenu.qml + focus/Core/ListViewDelegate.qml + + diff --git a/examples/quick/keyinteraction/main.cpp b/examples/quick/keyinteraction/main.cpp index e82e1d86cd..4f226e715a 100644 --- a/examples/quick/keyinteraction/main.cpp +++ b/examples/quick/keyinteraction/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(keyinteraction) +DECLARATIVE_EXAMPLE_MAIN(keyinteraction/keyinteraction) diff --git a/examples/quick/localstorage/localstorage/localstorage.pro b/examples/quick/localstorage/localstorage/localstorage.pro index ef90b63546..80c306fcc2 100644 --- a/examples/quick/localstorage/localstorage/localstorage.pro +++ b/examples/quick/localstorage/localstorage/localstorage.pro @@ -2,8 +2,9 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + localstorage.qrc \ + ../../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/localstorage/localstorage -qml.files = localstorage.qml hello.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/localstorage/localstorage -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/localstorage/localstorage/localstorage.qrc b/examples/quick/localstorage/localstorage/localstorage.qrc new file mode 100644 index 0000000000..09ac2de033 --- /dev/null +++ b/examples/quick/localstorage/localstorage/localstorage.qrc @@ -0,0 +1,6 @@ + + + hello.qml + localstorage.qml + + diff --git a/examples/quick/localstorage/localstorage/main.cpp b/examples/quick/localstorage/localstorage/main.cpp index 0f69fb7fdb..8433dbe55e 100644 --- a/examples/quick/localstorage/localstorage/main.cpp +++ b/examples/quick/localstorage/localstorage/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(localstorage) +DECLARATIVE_EXAMPLE_MAIN(localstorage/localstorage/localstorage) diff --git a/examples/quick/mousearea/main.cpp b/examples/quick/mousearea/main.cpp index 34e0b3b396..f07341c4ca 100644 --- a/examples/quick/mousearea/main.cpp +++ b/examples/quick/mousearea/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(mousearea) +DECLARATIVE_EXAMPLE_MAIN(mousearea/mousearea) diff --git a/examples/quick/mousearea/mousearea.pro b/examples/quick/mousearea/mousearea.pro index eba203ba18..782082924e 100644 --- a/examples/quick/mousearea/mousearea.pro +++ b/examples/quick/mousearea/mousearea.pro @@ -2,11 +2,10 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += mousearea.qrc EXAMPLE_FILES = \ mousearea-wheel-example.qml target.path = $$[QT_INSTALL_EXAMPLES]/quick/mousearea -qml.files = mousearea.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/mousearea -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/mousearea/mousearea.qrc b/examples/quick/mousearea/mousearea.qrc new file mode 100644 index 0000000000..23d30aa37c --- /dev/null +++ b/examples/quick/mousearea/mousearea.qrc @@ -0,0 +1,6 @@ + + + mousearea.qml + mousearea-wheel-example.qml + + diff --git a/examples/quick/particles/affectors/affectors.pro b/examples/quick/particles/affectors/affectors.pro index 9d7c3de059..673ccfbb81 100644 --- a/examples/quick/particles/affectors/affectors.pro +++ b/examples/quick/particles/affectors/affectors.pro @@ -2,8 +2,10 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + affectors.qrc \ + ../images.qrc \ + ../../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/affectors -qml.files = affectors.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/affectors -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/particles/affectors/affectors.qrc b/examples/quick/particles/affectors/affectors.qrc new file mode 100644 index 0000000000..c1d797e4d8 --- /dev/null +++ b/examples/quick/particles/affectors/affectors.qrc @@ -0,0 +1,16 @@ + + + affectors.qml + content/age.qml + content/attractor.qml + content/customaffector.qml + content/friction.qml + content/gravity.qml + content/GreyButton.qml + content/groupgoal.qml + content/move.qml + content/spritegoal.qml + content/turbulence.qml + content/wander.qml + + diff --git a/examples/quick/particles/affectors/main.cpp b/examples/quick/particles/affectors/main.cpp index 358fcb4d8d..76d79debc2 100644 --- a/examples/quick/particles/affectors/main.cpp +++ b/examples/quick/particles/affectors/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(affectors) +DECLARATIVE_EXAMPLE_MAIN(particles/affectors/affectors) diff --git a/examples/quick/particles/customparticle/customparticle.pro b/examples/quick/particles/customparticle/customparticle.pro index 77db1a6aab..66a6895d00 100644 --- a/examples/quick/particles/customparticle/customparticle.pro +++ b/examples/quick/particles/customparticle/customparticle.pro @@ -2,8 +2,11 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + customparticle.qrc \ + ../images.qrc \ + ../../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/customparticle -qml.files = customparticle.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/customparticle -INSTALLS += target qml +INSTALLS += target + diff --git a/examples/quick/particles/customparticle/customparticle.qrc b/examples/quick/particles/customparticle/customparticle.qrc new file mode 100644 index 0000000000..8a4e087a12 --- /dev/null +++ b/examples/quick/particles/customparticle/customparticle.qrc @@ -0,0 +1,8 @@ + + + customparticle.qml + content/blurparticles.qml + content/fragmentshader.qml + content/imagecolors.qml + + diff --git a/examples/quick/particles/customparticle/main.cpp b/examples/quick/particles/customparticle/main.cpp index ec5619c6f0..c873710470 100644 --- a/examples/quick/particles/customparticle/main.cpp +++ b/examples/quick/particles/customparticle/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(customparticle) +DECLARATIVE_EXAMPLE_MAIN(particles/customparticle/customparticle) diff --git a/examples/quick/particles/emitters/emitters.pro b/examples/quick/particles/emitters/emitters.pro index ea2e0d15ba..c5d8b8b0c9 100644 --- a/examples/quick/particles/emitters/emitters.pro +++ b/examples/quick/particles/emitters/emitters.pro @@ -2,8 +2,10 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + emitters.qrc \ + ../images.qrc \ + ../../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/emitters -qml.files = emitters.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/emitters -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/particles/emitters/emitters.qrc b/examples/quick/particles/emitters/emitters.qrc new file mode 100644 index 0000000000..708c8683f0 --- /dev/null +++ b/examples/quick/particles/emitters/emitters.qrc @@ -0,0 +1,12 @@ + + + emitters.qml + content/burstandpulse.qml + content/customemitter.qml + content/emitmask.qml + content/maximumemitted.qml + content/shapeanddirection.qml + content/trailemitter.qml + content/velocityfrommotion.qml + + diff --git a/examples/quick/particles/emitters/main.cpp b/examples/quick/particles/emitters/main.cpp index 01aff50ea3..579e0d0cb8 100644 --- a/examples/quick/particles/emitters/main.cpp +++ b/examples/quick/particles/emitters/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(emitters) +DECLARATIVE_EXAMPLE_MAIN(particles/emitters/emitters) diff --git a/examples/quick/particles/imageparticle/imageparticle.pro b/examples/quick/particles/imageparticle/imageparticle.pro index 94ed5fc7c3..e639c7423a 100644 --- a/examples/quick/particles/imageparticle/imageparticle.pro +++ b/examples/quick/particles/imageparticle/imageparticle.pro @@ -2,8 +2,10 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + imageparticle.qrc \ + ../images.qrc \ + ../../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/imageparticle -qml.files = imageparticle.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/imageparticle -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/particles/imageparticle/imageparticle.qrc b/examples/quick/particles/imageparticle/imageparticle.qrc new file mode 100644 index 0000000000..d9e4115e3e --- /dev/null +++ b/examples/quick/particles/imageparticle/imageparticle.qrc @@ -0,0 +1,12 @@ + + + imageparticle.qml + content/allatonce.qml + content/colored.qml + content/colortable.qml + content/deformation.qml + content/rotation.qml + content/sharing.qml + content/sprites.qml + + diff --git a/examples/quick/particles/imageparticle/main.cpp b/examples/quick/particles/imageparticle/main.cpp index 081aec03d7..576182ebe5 100644 --- a/examples/quick/particles/imageparticle/main.cpp +++ b/examples/quick/particles/imageparticle/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(imageparticle) +DECLARATIVE_EXAMPLE_MAIN(particles/imageparticle/imageparticle) diff --git a/examples/quick/particles/images.qrc b/examples/quick/particles/images.qrc new file mode 100644 index 0000000000..9f284a087d --- /dev/null +++ b/examples/quick/particles/images.qrc @@ -0,0 +1,38 @@ + + + images/_explo.png + images/backgroundLeaves.jpg + images/bear_tiles.png + images/candle.png + images/colortable.png + images/finalfrontier.png + images/flower.png + images/matchmask.png + images/meteor_explo.png + images/meteor.png + images/meteors.png + images/nullRock.png + images/particle.png + images/particle2.png + images/particle3.png + images/particle4.png + images/particleA.png + images/portal_bg.png + images/realLeaf1.png + images/realLeaf2.png + images/realLeaf3.png + images/realLeaf4.png + images/rocket.png + images/rocket2.png + images/sizeInOut.png + images/snowflake.png + images/sparkleSize.png + images/star.png + images/starfish_0.png + images/starfish_1.png + images/starfish_2.png + images/starfish_3.png + images/starfish_4.png + images/starfish_mask.png + + diff --git a/examples/quick/particles/system/main.cpp b/examples/quick/particles/system/main.cpp index ea67283822..0bc840474c 100644 --- a/examples/quick/particles/system/main.cpp +++ b/examples/quick/particles/system/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(system) +DECLARATIVE_EXAMPLE_MAIN(particles/system/system) diff --git a/examples/quick/particles/system/system.pro b/examples/quick/particles/system/system.pro index f2e3567543..df143f10a3 100644 --- a/examples/quick/particles/system/system.pro +++ b/examples/quick/particles/system/system.pro @@ -2,8 +2,10 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + system.qrc \ + ../images.qrc \ + ../../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/system -qml.files = system.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/system -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/particles/system/system.qrc b/examples/quick/particles/system/system.qrc new file mode 100644 index 0000000000..3fb8221fb1 --- /dev/null +++ b/examples/quick/particles/system/system.qrc @@ -0,0 +1,10 @@ + + + system.qml + content/dynamiccomparison.qml + content/dynamicemitters.qml + content/multiplepainters.qml + content/startstop.qml + content/timedgroupchanges.qml + + diff --git a/examples/quick/positioners/main.cpp b/examples/quick/positioners/main.cpp index 4ee4c82c56..5554af68c6 100644 --- a/examples/quick/positioners/main.cpp +++ b/examples/quick/positioners/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(positioners) +DECLARATIVE_EXAMPLE_MAIN(positioners/positioners) diff --git a/examples/quick/positioners/positioners.pro b/examples/quick/positioners/positioners.pro index 1a7622d0bc..a754d2a29a 100644 --- a/examples/quick/positioners/positioners.pro +++ b/examples/quick/positioners/positioners.pro @@ -2,8 +2,9 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + positioners.qrc \ + ../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/positioners -qml.files = positioners.qml positioners-transitions.qml positioners-attachedproperties.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/positioners -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/positioners/positioners.qrc b/examples/quick/positioners/positioners.qrc new file mode 100644 index 0000000000..7025a6f8d8 --- /dev/null +++ b/examples/quick/positioners/positioners.qrc @@ -0,0 +1,7 @@ + + + positioners.qml + positioners-attachedproperties.qml + positioners-transitions.qml + + diff --git a/examples/quick/righttoleft/main.cpp b/examples/quick/righttoleft/main.cpp index e1d102cfe3..c008e2c85a 100644 --- a/examples/quick/righttoleft/main.cpp +++ b/examples/quick/righttoleft/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(righttoleft) +DECLARATIVE_EXAMPLE_MAIN(righttoleft/righttoleft) diff --git a/examples/quick/righttoleft/righttoleft.pro b/examples/quick/righttoleft/righttoleft.pro index e71030e196..248564e07f 100644 --- a/examples/quick/righttoleft/righttoleft.pro +++ b/examples/quick/righttoleft/righttoleft.pro @@ -2,8 +2,9 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + righttoleft.qrc \ + ../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/righttoleft -qml.files = righttoleft.qml layoutdirection layoutmirroring textalignment -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/righttoleft -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/righttoleft/righttoleft.qrc b/examples/quick/righttoleft/righttoleft.qrc new file mode 100644 index 0000000000..1d9f068a1e --- /dev/null +++ b/examples/quick/righttoleft/righttoleft.qrc @@ -0,0 +1,8 @@ + + + righttoleft.qml + layoutdirection/layoutdirection.qml + layoutmirroring/layoutmirroring.qml + textalignment/textalignment.qml + + 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 @@ + + + main.qml + + 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("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("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 @@ + + + main.qml + + 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("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 @@ + + + main.qml + + diff --git a/examples/quick/shadereffects/main.cpp b/examples/quick/shadereffects/main.cpp index 2bb3224bd1..c40c78099e 100644 --- a/examples/quick/shadereffects/main.cpp +++ b/examples/quick/shadereffects/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(shadereffects) +DECLARATIVE_EXAMPLE_MAIN(shadereffects/shadereffects) diff --git a/examples/quick/shadereffects/shadereffects.pro b/examples/quick/shadereffects/shadereffects.pro index 265cb726e2..088b4a3f4f 100644 --- a/examples/quick/shadereffects/shadereffects.pro +++ b/examples/quick/shadereffects/shadereffects.pro @@ -2,8 +2,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += shadereffects.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/shadereffects -qml.files = shadereffects.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/shadereffects -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/shadereffects/shadereffects.qrc b/examples/quick/shadereffects/shadereffects.qrc new file mode 100644 index 0000000000..ff296a0155 --- /dev/null +++ b/examples/quick/shadereffects/shadereffects.qrc @@ -0,0 +1,8 @@ + + + shadereffects.qml + content/face-smile.png + content/qt-logo.png + content/Slider.qml + + diff --git a/examples/quick/shared/quick_shared.qrc b/examples/quick/shared/quick_shared.qrc new file mode 100644 index 0000000000..9fc114dc89 --- /dev/null +++ b/examples/quick/shared/quick_shared.qrc @@ -0,0 +1,8 @@ + + + LauncherList.qml + SimpleLauncherDelegate.qml + Button.qml + images/back.png + + diff --git a/examples/quick/shared/shared.h b/examples/quick/shared/shared.h index 7fd2f08a40..a7072daa89 100644 --- a/examples/quick/shared/shared.h +++ b/examples/quick/shared/shared.h @@ -45,32 +45,8 @@ {\ QGuiApplication app(argc,argv);\ QQuickView view;\ - QDir directory(QCoreApplication::applicationDirPath());\ - if (QGuiApplication::platformName() == QLatin1String("windows")) {\ - if (directory.absolutePath().endsWith("/debug", Qt::CaseInsensitive)\ - || directory.absolutePath().endsWith("/release", Qt::CaseInsensitive))\ - if (!directory.cdUp()) {\ - qWarning("Could not change to parent directory of '%s'",\ - qPrintable(QDir::toNativeSeparators(directory.absolutePath())));\ - return -1;\ - }\ - } else if (QGuiApplication::platformName() == QLatin1String("cocoa")) {\ - if (directory.absolutePath().endsWith(#NAME".app/Contents/MacOS"))\ - for (int i = 0; i < 3; ++i) {\ - if (!directory.cdUp()) {\ - qWarning("Could not change to parent directory of '%s'",\ - qPrintable(QDir::toNativeSeparators(directory.absolutePath())));\ - return -1;\ - }\ - }\ - }\ - const QString fileName(directory.absolutePath() + "/" #NAME ".qml");\ - if (!QFile::exists(fileName)) {\ - qWarning("Could not find file '%s'", qPrintable(QDir::toNativeSeparators(fileName)));\ - return -1;\ - }\ view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));\ - view.setSource(QUrl::fromLocalFile(fileName)); \ + view.setSource(QUrl("qrc:///" #NAME ".qml")); \ if (QGuiApplication::platformName() == QLatin1String("qnx") || \ QGuiApplication::platformName() == QLatin1String("eglfs")) {\ view.setResizeMode(QQuickView::SizeRootObjectToView);\ diff --git a/examples/quick/shared/shared.qrc b/examples/quick/shared/shared.qrc new file mode 100644 index 0000000000..4ac856e66b --- /dev/null +++ b/examples/quick/shared/shared.qrc @@ -0,0 +1,8 @@ + + + LauncherList.qml + SimpleLauncherDelegate.qml + Button.qml + images/back.png + + diff --git a/examples/quick/text/main.cpp b/examples/quick/text/main.cpp index 9b3c62657b..b8f927d81e 100644 --- a/examples/quick/text/main.cpp +++ b/examples/quick/text/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(text) +DECLARATIVE_EXAMPLE_MAIN(text/text) diff --git a/examples/quick/text/text.pro b/examples/quick/text/text.pro index 2f78548d05..733a99367b 100644 --- a/examples/quick/text/text.pro +++ b/examples/quick/text/text.pro @@ -2,8 +2,9 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + text.qrc \ + ../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/text -qml.files = fonts imgtag styledtext-layout.qml text.qml textselection -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/text -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/text/text.qrc b/examples/quick/text/text.qrc new file mode 100644 index 0000000000..f0d21627ad --- /dev/null +++ b/examples/quick/text/text.qrc @@ -0,0 +1,24 @@ + + + text.qml + fonts/availableFonts.qml + fonts/banner.qml + fonts/fonts.qml + fonts/hello.qml + fonts/content/fonts/tarzeau_ocr_a.ttf + imgtag/imgtag.qml + imgtag/images/face-sad.png + imgtag/images/face-smile-big.png + imgtag/images/face-smile.png + imgtag/images/heart200.png + imgtag/images/qtlogo.png + imgtag/images/starfish_2.png + textselection/textselection.qml + textselection/pics/endHandle.png + textselection/pics/endHandle.sci + textselection/pics/startHandle.png + textselection/pics/startHandle.sci + styledtext-layout.qml + imgtag/TextWithImage.qml + + diff --git a/examples/quick/threading/main.cpp b/examples/quick/threading/main.cpp index 47ea0b5709..7e4e485529 100644 --- a/examples/quick/threading/main.cpp +++ b/examples/quick/threading/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(threading) +DECLARATIVE_EXAMPLE_MAIN(threading/threading) diff --git a/examples/quick/threading/threading.pro b/examples/quick/threading/threading.pro index fa5488a47e..cd9ed25e0c 100644 --- a/examples/quick/threading/threading.pro +++ b/examples/quick/threading/threading.pro @@ -2,8 +2,9 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + threading.qrc \ + ../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/threading -qml.files = threading.qml threadedlistmodel workerscript -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/threading -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/threading/threading.qrc b/examples/quick/threading/threading.qrc new file mode 100644 index 0000000000..6d15b7ef71 --- /dev/null +++ b/examples/quick/threading/threading.qrc @@ -0,0 +1,10 @@ + + + threading.qml + threadedlistmodel/timedisplay.qml + threadedlistmodel/dataloader.js + workerscript/Spinner.qml + workerscript/workerscript.js + workerscript/workerscript.qml + + diff --git a/examples/quick/touchinteraction/main.cpp b/examples/quick/touchinteraction/main.cpp index aac3175743..6db041ef7d 100644 --- a/examples/quick/touchinteraction/main.cpp +++ b/examples/quick/touchinteraction/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(touchinteraction) +DECLARATIVE_EXAMPLE_MAIN(touchinteraction/touchinteraction) diff --git a/examples/quick/touchinteraction/touchinteraction.pro b/examples/quick/touchinteraction/touchinteraction.pro index 949651c9cf..0ae0a41cce 100644 --- a/examples/quick/touchinteraction/touchinteraction.pro +++ b/examples/quick/touchinteraction/touchinteraction.pro @@ -2,8 +2,9 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + touchinteraction.qrc \ + ../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/touchinteraction -qml.files = flickable multipointtouch pincharea touchinteraction.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/touchinteraction -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/touchinteraction/touchinteraction.qrc b/examples/quick/touchinteraction/touchinteraction.qrc new file mode 100644 index 0000000000..6cec506a0f --- /dev/null +++ b/examples/quick/touchinteraction/touchinteraction.qrc @@ -0,0 +1,27 @@ + + + touchinteraction.qml + flickable/basic-flickable.qml + flickable/corkboards.qml + flickable/content/cork.jpg + flickable/content/note-yellow.png + flickable/content/Panel.qml + flickable/content/tack.png + multipointtouch/bearwhack.qml + multipointtouch/multiflame.qml + multipointtouch/content/AugmentedTouchPoint.qml + multipointtouch/content/Bear0.png + multipointtouch/content/Bear1.png + multipointtouch/content/Bear2.png + multipointtouch/content/Bear3.png + multipointtouch/content/BearB.png + multipointtouch/content/BearWhackParticleSystem.qml + multipointtouch/content/blur-circle.png + multipointtouch/content/blur-circle3.png + multipointtouch/content/heart-blur.png + multipointtouch/content/ParticleFlame.qml + multipointtouch/content/title.png + pincharea/flickresize.qml + pincharea/qt-logo.jpg + + diff --git a/examples/quick/views/main.cpp b/examples/quick/views/main.cpp index 3d41683035..52704fcd2b 100644 --- a/examples/quick/views/main.cpp +++ b/examples/quick/views/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(views) +DECLARATIVE_EXAMPLE_MAIN(views/views) diff --git a/examples/quick/views/views.pro b/examples/quick/views/views.pro index b424ba66f2..a79126a838 100644 --- a/examples/quick/views/views.pro +++ b/examples/quick/views/views.pro @@ -2,16 +2,9 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp +RESOURCES += \ + views.qrc \ + ../shared/shared.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/views -qml.files = \ - views.qml \ - gridview \ - listview \ - package \ - parallax \ - pathview \ - visualdatamodel \ - visualitemmodel -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/views -INSTALLS += target qml +INSTALLS += target diff --git a/examples/quick/views/views.qrc b/examples/quick/views/views.qrc new file mode 100644 index 0000000000..e35f128202 --- /dev/null +++ b/examples/quick/views/views.qrc @@ -0,0 +1,69 @@ + + + gridview/gridview-example.qml + gridview/pics/AddressBook_48.png + gridview/pics/AudioPlayer_48.png + gridview/pics/Camera_48.png + gridview/pics/DateBook_48.png + gridview/pics/EMail_48.png + gridview/pics/TodoList_48.png + gridview/pics/VideoPlayer_48.png + listview/dynamiclist.qml + listview/expandingdelegates.qml + listview/highlight.qml + listview/highlightranges.qml + listview/sections.qml + listview/content/PetsModel.qml + listview/content/PressAndHoldButton.qml + listview/content/RecipesModel.qml + listview/content/SmallText.qml + listview/content/TextButton.qml + listview/content/ToggleButton.qml + listview/content/pics/arrow-down.png + listview/content/pics/arrow-up.png + listview/content/pics/fruit-salad.jpg + listview/content/pics/hamburger.jpg + listview/content/pics/lemonade.jpg + listview/content/pics/list-delete.png + listview/content/pics/minus-sign.png + listview/content/pics/moreDown.png + listview/content/pics/moreUp.png + listview/content/pics/pancakes.jpg + listview/content/pics/plus-sign.png + listview/content/pics/vegetable-soup.jpg + package/Delegate.qml + package/view.qml + parallax/parallax.qml + parallax/content/Smiley.qml + parallax/content/background.png + parallax/content/center.png + parallax/content/clock-night.png + parallax/content/clock.png + parallax/content/Clock.qml + parallax/content/hour.png + parallax/content/minute.png + parallax/content/ParallaxView.qml + parallax/content/quit.png + parallax/content/QuitButton.qml + parallax/content/second.png + parallax/content/pics/background.jpg + parallax/content/pics/face-smile.png + parallax/content/pics/home-page.png + parallax/content/pics/home-page.svg + parallax/content/pics/shadow.png + parallax/content/pics/yast-joystick.png + parallax/content/pics/yast-wol.png + pathview/pathview-example.qml + pathview/pics/AddressBook_48.png + pathview/pics/AudioPlayer_48.png + pathview/pics/Camera_48.png + pathview/pics/DateBook_48.png + pathview/pics/EMail_48.png + pathview/pics/TodoList_48.png + pathview/pics/VideoPlayer_48.png + visualdatamodel/slideshow.qml + visualdatamodel/dragselection.qml + visualitemmodel/visualitemmodel.qml + views.qml + + diff --git a/examples/quick/window/window/window.cpp b/examples/quick/window/window/window.cpp index c9e6e90997..619e275f75 100644 --- a/examples/quick/window/window/window.cpp +++ b/examples/quick/window/window/window.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); QQmlEngine engine; QQmlComponent component(&engine); - component.loadUrl(QUrl::fromLocalFile("Window.qml")); + component.loadUrl(QUrl("qrc:///window/window/Window.qml")); if ( component.isReady() ) component.create(); else diff --git a/examples/quick/window/window/window.pro b/examples/quick/window/window/window.pro index e8a022361f..6df7ce8849 100644 --- a/examples/quick/window/window/window.pro +++ b/examples/quick/window/window/window.pro @@ -3,9 +3,7 @@ CONFIG += qt QT += qml SOURCES += window.cpp +RESOURCES += window.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/window/window -qml.files = Window.qml nogui.qml standalone.qml twowindows.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/quick/window/window - -INSTALLS = target qml +INSTALLS = target diff --git a/examples/quick/window/window/window.qrc b/examples/quick/window/window/window.qrc new file mode 100644 index 0000000000..c203c140fc --- /dev/null +++ b/examples/quick/window/window/window.qrc @@ -0,0 +1,5 @@ + + + Window.qml + + -- cgit v1.2.3