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/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 +++++++ 15 files changed, 222 insertions(+), 20 deletions(-) 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 (limited to 'examples/quick/demos') 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 + + -- cgit v1.2.3