diff options
Diffstat (limited to 'examples/declarative')
-rw-r--r-- | examples/declarative/declarative.pro | 8 | ||||
-rw-r--r-- | examples/declarative/demos/calculator/calculator.desktop (renamed from examples/declarative/calculator/calculator.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/calculator/calculator.pro (renamed from examples/declarative/calculator/calculator.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/demos/calculator/calculator.qmlproject (renamed from examples/declarative/calculator/calculator.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/calculator/calculator.svg (renamed from examples/declarative/calculator/calculator.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/calculator/calculator64.png (renamed from examples/declarative/calculator/calculator64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/demos/calculator/calculator80.png (renamed from examples/declarative/calculator/calculator80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/demos/calculator/calculator_harmattan.desktop (renamed from examples/declarative/calculator/calculator_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/calculator/main.cpp (renamed from examples/declarative/calculator/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/calculator/qml/calculator/CalculatorCore/Button.qml (renamed from examples/declarative/calculator/qml/calculator/CalculatorCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/calculator/qml/calculator/CalculatorCore/Display.qml (renamed from examples/declarative/calculator/qml/calculator/CalculatorCore/Display.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/calculator/qml/calculator/CalculatorCore/calculator.js (renamed from examples/declarative/calculator/qml/calculator/CalculatorCore/calculator.js) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-.png (renamed from examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-.png) | bin | 1288 -> 1288 bytes | |||
-rw-r--r-- | examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-blue.png (renamed from examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-blue.png) | bin | 1565 -> 1565 bytes | |||
-rw-r--r-- | examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-green.png (renamed from examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-green.png) | bin | 1543 -> 1543 bytes | |||
-rw-r--r-- | examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-purple.png (renamed from examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-purple.png) | bin | 1566 -> 1566 bytes | |||
-rw-r--r-- | examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-red.png (renamed from examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-red.png) | bin | 1586 -> 1586 bytes | |||
-rw-r--r-- | examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/display.png (renamed from examples/declarative/calculator/qml/calculator/CalculatorCore/images/display.png) | bin | 998 -> 998 bytes | |||
-rw-r--r-- | examples/declarative/demos/calculator/qml/calculator/CalculatorCore/qmldir (renamed from examples/declarative/calculator/qml/calculator/CalculatorCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/calculator/qml/calculator/calculator.qml (renamed from examples/declarative/calculator/qml/calculator/calculator.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/demos.pro | 10 | ||||
-rw-r--r-- | examples/declarative/demos/doc/images/qml-calculator-example.png | bin | 0 -> 33892 bytes | |||
-rw-r--r-- | examples/declarative/demos/doc/images/qml-minehunt-demo.png | bin | 0 -> 170648 bytes | |||
-rw-r--r-- | examples/declarative/demos/doc/images/qml-photoviewer-demo.png | bin | 0 -> 473306 bytes | |||
-rw-r--r-- | examples/declarative/demos/doc/images/qml-rssnews-demo.png | bin | 0 -> 128307 bytes | |||
-rw-r--r-- | examples/declarative/demos/doc/images/qml-samegame-demo.png | bin | 0 -> 213137 bytes | |||
-rw-r--r-- | examples/declarative/demos/doc/images/qml-snake-demo.png | bin | 0 -> 105053 bytes | |||
-rw-r--r-- | examples/declarative/demos/doc/images/qml-twitter-demo.png | bin | 0 -> 95812 bytes | |||
-rw-r--r-- | examples/declarative/demos/doc/src/qml-calculator.qdoc | 37 | ||||
-rw-r--r-- | examples/declarative/demos/doc/src/qml-minehunt.qdoc | 38 | ||||
-rw-r--r-- | examples/declarative/demos/doc/src/qml-photoviewer.qdoc | 37 | ||||
-rw-r--r-- | examples/declarative/demos/doc/src/qml-rssnews.qdoc | 37 | ||||
-rw-r--r-- | examples/declarative/demos/doc/src/qml-samegame.qdoc | 38 | ||||
-rw-r--r-- | examples/declarative/demos/doc/src/qml-snake.qdoc | 38 | ||||
-rw-r--r-- | examples/declarative/demos/doc/src/qml-twitter.qdoc | 38 | ||||
-rw-r--r-- | examples/declarative/demos/minehunt/README (renamed from examples/declarative/minehunt/README) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/minehunt/main.cpp (renamed from examples/declarative/minehunt/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/minehunt/minehunt.cpp (renamed from examples/declarative/minehunt/minehunt.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/minehunt/minehunt.h (renamed from examples/declarative/minehunt/minehunt.h) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/minehunt/minehunt.pro (renamed from examples/declarative/minehunt/minehunt.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/demos/minehunt/minehunt.qmlproject (renamed from examples/declarative/minehunt/minehunt.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/minehunt/minehunt.qrc (renamed from examples/declarative/minehunt/minehunt.qrc) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/Explosion.qml (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/Tile.qml (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/back.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/back.png) | bin | 558 -> 558 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/background.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/background.png) | bin | 313930 -> 313930 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png) | bin | 284 -> 284 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png) | bin | 535 -> 535 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png) | bin | 14844 -> 14844 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png) | bin | 13810 -> 13810 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png) | bin | 15408 -> 15408 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png) | bin | 219 -> 219 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag.png) | bin | 196 -> 196 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/front.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/front.png) | bin | 580 -> 580 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/quit.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/quit.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/star.png (renamed from examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/star.png) | bin | 2677 -> 2677 bytes | |||
-rw-r--r-- | examples/declarative/demos/minehunt/qml/minehunt/minehunt.qml (renamed from examples/declarative/minehunt/qml/minehunt/minehunt.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/main.cpp (renamed from examples/declarative/photoviewer/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/photoviewer.desktop (renamed from examples/declarative/photoviewer/photoviewer.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/photoviewer.pro (renamed from examples/declarative/photoviewer/photoviewer.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/photoviewer.qmlproject (renamed from examples/declarative/photoviewer/photoviewer.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/photoviewer.svg (renamed from examples/declarative/photoviewer/photoviewer.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/photoviewer64.png (renamed from examples/declarative/photoviewer/photoviewer64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/demos/photoviewer/photoviewer80.png (renamed from examples/declarative/photoviewer/photoviewer80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/demos/photoviewer/photoviewer_harmattan.desktop (renamed from examples/declarative/photoviewer/photoviewer_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png) | bin | 588 -> 588 bytes | |||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png) | bin | 2629 -> 2629 bytes | |||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png) | bin | 8844 -> 8844 bytes | |||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js (renamed from examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/i18n/base.ts (renamed from examples/declarative/photoviewer/qml/photoviewer/i18n/base.ts) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/i18n/qml_fr.qm (renamed from examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.qm) | bin | 268 -> 268 bytes | |||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/i18n/qml_fr.ts (renamed from examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.ts) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/photoviewer/qml/photoviewer/photoviewer.qml (renamed from examples/declarative/photoviewer/qml/photoviewer/photoviewer.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/main.cpp (renamed from examples/declarative/rssnews/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/qml/rssnews/content/BusyIndicator.qml (renamed from examples/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/qml/rssnews/content/CategoryDelegate.qml (renamed from examples/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/qml/rssnews/content/NewsDelegate.qml (renamed from examples/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/qml/rssnews/content/RssFeeds.qml (renamed from examples/declarative/rssnews/qml/rssnews/content/RssFeeds.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/qml/rssnews/content/ScrollBar.qml (renamed from examples/declarative/rssnews/qml/rssnews/content/ScrollBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/qml/rssnews/content/images/busy.png (renamed from examples/declarative/rssnews/qml/rssnews/content/images/busy.png) | bin | 2629 -> 2629 bytes | |||
-rw-r--r-- | examples/declarative/demos/rssnews/qml/rssnews/content/images/scrollbar.png (renamed from examples/declarative/rssnews/qml/rssnews/content/images/scrollbar.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | examples/declarative/demos/rssnews/qml/rssnews/rssnews.qml (renamed from examples/declarative/rssnews/qml/rssnews/rssnews.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/rssnews.desktop (renamed from examples/declarative/rssnews/rssnews.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/rssnews.pro (renamed from examples/declarative/rssnews/rssnews.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/rssnews.qmlproject (renamed from examples/declarative/rssnews/rssnews.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/rssnews.svg (renamed from examples/declarative/rssnews/rssnews.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/rssnews/rssnews64.png (renamed from examples/declarative/rssnews/rssnews64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/demos/rssnews/rssnews80.png (renamed from examples/declarative/rssnews/rssnews80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/demos/rssnews/rssnews_harmattan.desktop (renamed from examples/declarative/rssnews/rssnews_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/main.cpp (renamed from examples/declarative/samegame/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/BoomBlock.qml (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/Button.qml (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/Dialog.qml (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/background.png (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/pics/background.png) | bin | 313930 -> 313930 bytes | |||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/blueStar.png (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStar.png) | bin | 278 -> 278 bytes | |||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/blueStone.png (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStone.png) | bin | 3054 -> 3054 bytes | |||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/greenStar.png (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStar.png) | bin | 273 -> 273 bytes | |||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/greenStone.png (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStone.png) | bin | 2932 -> 2932 bytes | |||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/redStar.png (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStar.png) | bin | 274 -> 274 bytes | |||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/redStone.png (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStone.png) | bin | 2902 -> 2902 bytes | |||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/star.png (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/pics/star.png) | bin | 262 -> 262 bytes | |||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/yellowStone.png (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/pics/yellowStone.png) | bin | 3056 -> 3056 bytes | |||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/qmldir (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/SamegameCore/samegame.js (renamed from examples/declarative/samegame/qml/samegame/SamegameCore/samegame.js) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/highscores/README (renamed from examples/declarative/samegame/qml/samegame/highscores/README) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/highscores/score_data.xml (renamed from examples/declarative/samegame/qml/samegame/highscores/score_data.xml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/highscores/score_style.xsl (renamed from examples/declarative/samegame/qml/samegame/highscores/score_style.xsl) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/highscores/scores.php (renamed from examples/declarative/samegame/qml/samegame/highscores/scores.php) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/qml/samegame/samegame.qml (renamed from examples/declarative/samegame/qml/samegame/samegame.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/samegame.desktop (renamed from examples/declarative/samegame/samegame.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/samegame.pro (renamed from examples/declarative/samegame/samegame.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/samegame.qmlproject (renamed from examples/declarative/samegame/samegame.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/samegame.svg (renamed from examples/declarative/samegame/samegame.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/samegame/samegame64.png (renamed from examples/declarative/samegame/samegame64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/demos/samegame/samegame80.png (renamed from examples/declarative/samegame/samegame80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/demos/samegame/samegame_harmattan.desktop (renamed from examples/declarative/samegame/samegame_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/main.cpp (renamed from examples/declarative/snake/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/Button.qml (renamed from examples/declarative/snake/qml/snake/content/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/Cookie.qml (renamed from examples/declarative/snake/qml/snake/content/Cookie.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/HighScoreModel.qml (renamed from examples/declarative/snake/qml/snake/content/HighScoreModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/Link.qml (renamed from examples/declarative/snake/qml/snake/content/Link.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/Skull.qml (renamed from examples/declarative/snake/qml/snake/content/Skull.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/README (renamed from examples/declarative/snake/qml/snake/content/pics/README) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/background.png (renamed from examples/declarative/snake/qml/snake/content/pics/background.png) | bin | 144508 -> 144508 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/blueStar.png (renamed from examples/declarative/snake/qml/snake/content/pics/blueStar.png) | bin | 272 -> 272 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/blueStone.png (renamed from examples/declarative/snake/qml/snake/content/pics/blueStone.png) | bin | 3139 -> 3139 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/cookie.png (renamed from examples/declarative/snake/qml/snake/content/pics/cookie.png) | bin | 2729 -> 2729 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/eyes.svg (renamed from examples/declarative/snake/qml/snake/content/pics/eyes.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/head.png (renamed from examples/declarative/snake/qml/snake/content/pics/head.png) | bin | 3473 -> 3473 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/head.svg (renamed from examples/declarative/snake/qml/snake/content/pics/head.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/pause.png (renamed from examples/declarative/snake/qml/snake/content/pics/pause.png) | bin | 4327 -> 4327 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/redStar.png (renamed from examples/declarative/snake/qml/snake/content/pics/redStar.png) | bin | 273 -> 273 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/redStone.png (renamed from examples/declarative/snake/qml/snake/content/pics/redStone.png) | bin | 3456 -> 3456 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/skull.png (renamed from examples/declarative/snake/qml/snake/content/pics/skull.png) | bin | 2543 -> 2543 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/snake.jpg (renamed from examples/declarative/snake/qml/snake/content/pics/snake.jpg) | bin | 663901 -> 663901 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/star.png (renamed from examples/declarative/snake/qml/snake/content/pics/star.png) | bin | 262 -> 262 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/stoneShadow.png (renamed from examples/declarative/snake/qml/snake/content/pics/stoneShadow.png) | bin | 1699 -> 1699 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/yellowStar.png (renamed from examples/declarative/snake/qml/snake/content/pics/yellowStar.png) | bin | 276 -> 276 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/pics/yellowStone.png (renamed from examples/declarative/snake/qml/snake/content/pics/yellowStone.png) | bin | 2667 -> 2667 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/content/snake.js (renamed from examples/declarative/snake/qml/snake/content/snake.js) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/qml/snake/snake.qml (renamed from examples/declarative/snake/qml/snake/snake.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/snake.desktop (renamed from examples/declarative/snake/snake.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/snake.pro (renamed from examples/declarative/snake/snake.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/demos/snake/snake.qmlproject (renamed from examples/declarative/snake/snake.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/snake.svg (renamed from examples/declarative/snake/snake.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/snake/snake64.png (renamed from examples/declarative/snake/snake64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/snake80.png (renamed from examples/declarative/snake/snake80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/demos/snake/snake_harmattan.desktop (renamed from examples/declarative/snake/snake_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/main.cpp (renamed from examples/declarative/twitter/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/Button.qml (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/FatDelegate.qml (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/Input.qml (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/Input.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/Loading.qml (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/Loading.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/RssModel.qml (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/SearchView.qml (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/TitleBar.qml (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/ToolBar.qml (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/UserModel.qml (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/gloss.png (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/images/gloss.png) | bin | 1236 -> 1236 bytes | |||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/lineedit.png (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.png) | bin | 1415 -> 1415 bytes | |||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/lineedit.sci (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/loading.png (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/images/loading.png) | bin | 813 -> 813 bytes | |||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/quit.png (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/images/quit.png) | bin | 2369 -> 2369 bytes | |||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/stripes.png (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/images/stripes.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/titlebar.png (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.png) | bin | 1436 -> 1436 bytes | |||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/titlebar.sci (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.png (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.png) | bin | 2550 -> 2550 bytes | |||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.sci (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/TwitterCore/qmldir (renamed from examples/declarative/twitter/qml/twitter/TwitterCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/qml/twitter/twitter.qml (renamed from examples/declarative/twitter/qml/twitter/twitter.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/twitter.desktop (renamed from examples/declarative/twitter/twitter.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/twitter.pro (renamed from examples/declarative/twitter/twitter.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/twitter.qmlproject (renamed from examples/declarative/twitter/twitter.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/twitter.svg (renamed from examples/declarative/twitter/twitter.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/demos/twitter/twitter64.png (renamed from examples/declarative/twitter/twitter64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/demos/twitter/twitter80.png (renamed from examples/declarative/twitter/twitter80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/demos/twitter/twitter_harmattan.desktop (renamed from examples/declarative/twitter/twitter_harmattan.desktop) | 0 |
187 files changed, 288 insertions, 21 deletions
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index 123539ff..35f6d9c7 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -2,28 +2,22 @@ TEMPLATE = subdirs # These examples contain some C++ and need to be built SUBDIRS = \ + demos \ animation \ - calculator \ cppextensions \ flickr \ i18n \ imageelements \ keyinteraction/focus \ - minehunt \ modelviews \ - photoviewer \ positioners \ righttoleft \ - rssnews \ - samegame \ - snake \ sqllocalstorage \ text \ threading \ touchinteraction \ toys \ tutorials \ - twitter \ ui-components # OpenGL shader examples requires opengl and they contain some C++ and need to be built diff --git a/examples/declarative/calculator/calculator.desktop b/examples/declarative/demos/calculator/calculator.desktop index 854120f2..854120f2 100644 --- a/examples/declarative/calculator/calculator.desktop +++ b/examples/declarative/demos/calculator/calculator.desktop diff --git a/examples/declarative/calculator/calculator.pro b/examples/declarative/demos/calculator/calculator.pro index 3591af05..1d9475d0 100644 --- a/examples/declarative/calculator/calculator.pro +++ b/examples/declarative/demos/calculator/calculator.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/calculator +desktopInstallPrefix = $$[QT_INSTALL_EXAMPLES]/declarative/demos/calculator exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/calculator/calculator.qmlproject b/examples/declarative/demos/calculator/calculator.qmlproject index 88ca3caa..88ca3caa 100644 --- a/examples/declarative/calculator/calculator.qmlproject +++ b/examples/declarative/demos/calculator/calculator.qmlproject diff --git a/examples/declarative/calculator/calculator.svg b/examples/declarative/demos/calculator/calculator.svg index 566acfad..566acfad 100644 --- a/examples/declarative/calculator/calculator.svg +++ b/examples/declarative/demos/calculator/calculator.svg diff --git a/examples/declarative/calculator/calculator64.png b/examples/declarative/demos/calculator/calculator64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/declarative/calculator/calculator64.png +++ b/examples/declarative/demos/calculator/calculator64.png diff --git a/examples/declarative/calculator/calculator80.png b/examples/declarative/demos/calculator/calculator80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/declarative/calculator/calculator80.png +++ b/examples/declarative/demos/calculator/calculator80.png diff --git a/examples/declarative/calculator/calculator_harmattan.desktop b/examples/declarative/demos/calculator/calculator_harmattan.desktop index 574521d8..574521d8 100644 --- a/examples/declarative/calculator/calculator_harmattan.desktop +++ b/examples/declarative/demos/calculator/calculator_harmattan.desktop diff --git a/examples/declarative/calculator/main.cpp b/examples/declarative/demos/calculator/main.cpp index e10d3011..e10d3011 100644 --- a/examples/declarative/calculator/main.cpp +++ b/examples/declarative/demos/calculator/main.cpp diff --git a/examples/declarative/calculator/qml/calculator/CalculatorCore/Button.qml b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/Button.qml index b3589257..b3589257 100644 --- a/examples/declarative/calculator/qml/calculator/CalculatorCore/Button.qml +++ b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/Button.qml diff --git a/examples/declarative/calculator/qml/calculator/CalculatorCore/Display.qml b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/Display.qml index f744bcad..f744bcad 100644 --- a/examples/declarative/calculator/qml/calculator/CalculatorCore/Display.qml +++ b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/Display.qml diff --git a/examples/declarative/calculator/qml/calculator/CalculatorCore/calculator.js b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/calculator.js index 7c363c7f..7c363c7f 100644 --- a/examples/declarative/calculator/qml/calculator/CalculatorCore/calculator.js +++ b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/calculator.js diff --git a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-.png b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-.png Binary files differindex 544e5145..544e5145 100644 --- a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-.png +++ b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-.png diff --git a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-blue.png b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-blue.png Binary files differindex 5f92de32..5f92de32 100644 --- a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-blue.png +++ b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-blue.png diff --git a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-green.png b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-green.png Binary files differindex 36c93914..36c93914 100644 --- a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-green.png +++ b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-green.png diff --git a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-purple.png b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-purple.png Binary files differindex 347cbbea..347cbbea 100644 --- a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-purple.png +++ b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-purple.png diff --git a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-red.png b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-red.png Binary files differindex 3b335891..3b335891 100644 --- a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-red.png +++ b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/button-red.png diff --git a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/display.png b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/display.png Binary files differindex 9507f438..9507f438 100644 --- a/examples/declarative/calculator/qml/calculator/CalculatorCore/images/display.png +++ b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/images/display.png diff --git a/examples/declarative/calculator/qml/calculator/CalculatorCore/qmldir b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/qmldir index a926b93f..a926b93f 100644 --- a/examples/declarative/calculator/qml/calculator/CalculatorCore/qmldir +++ b/examples/declarative/demos/calculator/qml/calculator/CalculatorCore/qmldir diff --git a/examples/declarative/calculator/qml/calculator/calculator.qml b/examples/declarative/demos/calculator/qml/calculator/calculator.qml index d7355082..d7355082 100644 --- a/examples/declarative/calculator/qml/calculator/calculator.qml +++ b/examples/declarative/demos/calculator/qml/calculator/calculator.qml diff --git a/examples/declarative/demos/demos.pro b/examples/declarative/demos/demos.pro new file mode 100644 index 00000000..7fb61b8a --- /dev/null +++ b/examples/declarative/demos/demos.pro @@ -0,0 +1,10 @@ +TEMPLATE = subdirs + +SUBDIRS = \ + calculator \ + minehunt \ + photoviewer \ + rssnews \ + samegame \ + snake \ + twitter diff --git a/examples/declarative/demos/doc/images/qml-calculator-example.png b/examples/declarative/demos/doc/images/qml-calculator-example.png Binary files differnew file mode 100644 index 00000000..0f9ced80 --- /dev/null +++ b/examples/declarative/demos/doc/images/qml-calculator-example.png diff --git a/examples/declarative/demos/doc/images/qml-minehunt-demo.png b/examples/declarative/demos/doc/images/qml-minehunt-demo.png Binary files differnew file mode 100644 index 00000000..3b695693 --- /dev/null +++ b/examples/declarative/demos/doc/images/qml-minehunt-demo.png diff --git a/examples/declarative/demos/doc/images/qml-photoviewer-demo.png b/examples/declarative/demos/doc/images/qml-photoviewer-demo.png Binary files differnew file mode 100644 index 00000000..be6f1bf1 --- /dev/null +++ b/examples/declarative/demos/doc/images/qml-photoviewer-demo.png diff --git a/examples/declarative/demos/doc/images/qml-rssnews-demo.png b/examples/declarative/demos/doc/images/qml-rssnews-demo.png Binary files differnew file mode 100644 index 00000000..b4143b46 --- /dev/null +++ b/examples/declarative/demos/doc/images/qml-rssnews-demo.png diff --git a/examples/declarative/demos/doc/images/qml-samegame-demo.png b/examples/declarative/demos/doc/images/qml-samegame-demo.png Binary files differnew file mode 100644 index 00000000..945f2b96 --- /dev/null +++ b/examples/declarative/demos/doc/images/qml-samegame-demo.png diff --git a/examples/declarative/demos/doc/images/qml-snake-demo.png b/examples/declarative/demos/doc/images/qml-snake-demo.png Binary files differnew file mode 100644 index 00000000..d3c077d1 --- /dev/null +++ b/examples/declarative/demos/doc/images/qml-snake-demo.png diff --git a/examples/declarative/demos/doc/images/qml-twitter-demo.png b/examples/declarative/demos/doc/images/qml-twitter-demo.png Binary files differnew file mode 100644 index 00000000..63d6486a --- /dev/null +++ b/examples/declarative/demos/doc/images/qml-twitter-demo.png diff --git a/examples/declarative/demos/doc/src/qml-calculator.qdoc b/examples/declarative/demos/doc/src/qml-calculator.qdoc new file mode 100644 index 00000000..fb470771 --- /dev/null +++ b/examples/declarative/demos/doc/src/qml-calculator.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Calculator + \example declarative/demos/calculator + \brief Shows how to write a calculator in QML + \ingroup qmldemos + + This example shows how to write a simple calculator application in QML and JavaScript. + + \image qml-calculator-example.png +*/ diff --git a/examples/declarative/demos/doc/src/qml-minehunt.qdoc b/examples/declarative/demos/doc/src/qml-minehunt.qdoc new file mode 100644 index 00000000..0f7c3b3f --- /dev/null +++ b/examples/declarative/demos/doc/src/qml-minehunt.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Minehunt + \example declarative/demos/minehunt + \brief Shows how to write a Minehunt game in QML + \ingroup qmldemos + + This example shows how to create a simple Minehunt game, using QML for the + UI and C++ for the game logic. + + \image qml-minehunt-demo.png +*/ diff --git a/examples/declarative/demos/doc/src/qml-photoviewer.qdoc b/examples/declarative/demos/doc/src/qml-photoviewer.qdoc new file mode 100644 index 00000000..af1c84cf --- /dev/null +++ b/examples/declarative/demos/doc/src/qml-photoviewer.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Photo Viewer + \example declarative/demos/photoviewer + \brief Shows how to write a Flickr photo viewer in QML + \ingroup qmldemos + + This example shows how to write a Flickr photo viewer application in QML. + + \image qml-photoviewer-demo.png +*/ diff --git a/examples/declarative/demos/doc/src/qml-rssnews.qdoc b/examples/declarative/demos/doc/src/qml-rssnews.qdoc new file mode 100644 index 00000000..60ba20e4 --- /dev/null +++ b/examples/declarative/demos/doc/src/qml-rssnews.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title RSS News + \example declarative/demos/rssnews + \brief Shows how to write an RSS news reader in QML + \ingroup qmldemos + + This example shows how to write an RSS news reader in QML. + + \image qml-rssnews-demo.png +*/ diff --git a/examples/declarative/demos/doc/src/qml-samegame.qdoc b/examples/declarative/demos/doc/src/qml-samegame.qdoc new file mode 100644 index 00000000..f8ebef0b --- /dev/null +++ b/examples/declarative/demos/doc/src/qml-samegame.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Same Game + \example declarative/demos/samegame + \brief Shows how to write a Same Game in QML + \ingroup qmldemos + + This example shows how to write a 'Same Game' game in QML, using Javascript + for all the game logic. + + \image qml-samegame-demo.png +*/ diff --git a/examples/declarative/demos/doc/src/qml-snake.qdoc b/examples/declarative/demos/doc/src/qml-snake.qdoc new file mode 100644 index 00000000..131fabf8 --- /dev/null +++ b/examples/declarative/demos/doc/src/qml-snake.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Snake + \example declarative/demos/snake + \brief Shows how to write a Snake game in QML + \ingroup qmldemos + + This example shows how to write a Snake game in QML, controlled by the + keyboard as well as the mouse. + + \image qml-snake-demo.png +*/ diff --git a/examples/declarative/demos/doc/src/qml-twitter.qdoc b/examples/declarative/demos/doc/src/qml-twitter.qdoc new file mode 100644 index 00000000..20b07baa --- /dev/null +++ b/examples/declarative/demos/doc/src/qml-twitter.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Twitter Mobile + \example declarative/demos/twitter + \brief Shows how to write a Twitter client in QML + \ingroup qmldemos + + This example shows how to write a mobile Twitter search client in QML. Use it to + see what people think about Qt Quick! + + \image qml-twitter-demo.png +*/ diff --git a/examples/declarative/minehunt/README b/examples/declarative/demos/minehunt/README index 3849ca5f..3849ca5f 100644 --- a/examples/declarative/minehunt/README +++ b/examples/declarative/demos/minehunt/README diff --git a/examples/declarative/minehunt/main.cpp b/examples/declarative/demos/minehunt/main.cpp index d23c2b3a..d23c2b3a 100644 --- a/examples/declarative/minehunt/main.cpp +++ b/examples/declarative/demos/minehunt/main.cpp diff --git a/examples/declarative/minehunt/minehunt.cpp b/examples/declarative/demos/minehunt/minehunt.cpp index 70ca035e..70ca035e 100644 --- a/examples/declarative/minehunt/minehunt.cpp +++ b/examples/declarative/demos/minehunt/minehunt.cpp diff --git a/examples/declarative/minehunt/minehunt.h b/examples/declarative/demos/minehunt/minehunt.h index cbde1a56..cbde1a56 100644 --- a/examples/declarative/minehunt/minehunt.h +++ b/examples/declarative/demos/minehunt/minehunt.h diff --git a/examples/declarative/minehunt/minehunt.pro b/examples/declarative/demos/minehunt/minehunt.pro index 6a630a1f..f7c46ec7 100644 --- a/examples/declarative/minehunt/minehunt.pro +++ b/examples/declarative/demos/minehunt/minehunt.pro @@ -19,7 +19,7 @@ SOURCES += main.cpp minehunt.cpp RESOURCES = minehunt.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/minehunt +desktopInstallPrefix = $$[QT_INSTALL_EXAMPLES]/declarative/demos/minehunt exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/minehunt/minehunt.qmlproject b/examples/declarative/demos/minehunt/minehunt.qmlproject index 1f8b659f..1f8b659f 100644 --- a/examples/declarative/minehunt/minehunt.qmlproject +++ b/examples/declarative/demos/minehunt/minehunt.qmlproject diff --git a/examples/declarative/minehunt/minehunt.qrc b/examples/declarative/demos/minehunt/minehunt.qrc index 4694beb1..4694beb1 100644 --- a/examples/declarative/minehunt/minehunt.qrc +++ b/examples/declarative/demos/minehunt/minehunt.qrc diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/Explosion.qml index 8970b0ec..8970b0ec 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/Explosion.qml diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/Tile.qml index 79529ef3..79529ef3 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/Tile.qml diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/back.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/back.png Binary files differindex f6b3f0b4..f6b3f0b4 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/back.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/back.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/background.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/background.png Binary files differindex 3734a277..3734a277 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/background.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/background.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png Binary files differindex 61ad0a92..61ad0a92 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png Binary files differindex a9925755..a9925755 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png Binary files differindex cf00aafe..cf00aafe 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png Binary files differindex f9c2335d..f9c2335d 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png Binary files differindex 3d66d725..3d66d725 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png Binary files differindex aadad0f1..aadad0f1 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag.png Binary files differindex 39cde4df..39cde4df 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/front.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/front.png Binary files differindex 834331bd..834331bd 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/front.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/front.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/quit.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/quit.png Binary files differindex b822057d..b822057d 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/quit.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/quit.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/star.png b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/star.png Binary files differindex 37723591..37723591 100644 --- a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/star.png +++ b/examples/declarative/demos/minehunt/qml/minehunt/MinehuntCore/pics/star.png diff --git a/examples/declarative/minehunt/qml/minehunt/minehunt.qml b/examples/declarative/demos/minehunt/qml/minehunt/minehunt.qml index 92dba346..92dba346 100644 --- a/examples/declarative/minehunt/qml/minehunt/minehunt.qml +++ b/examples/declarative/demos/minehunt/qml/minehunt/minehunt.qml diff --git a/examples/declarative/photoviewer/main.cpp b/examples/declarative/demos/photoviewer/main.cpp index 61ac2717..61ac2717 100644 --- a/examples/declarative/photoviewer/main.cpp +++ b/examples/declarative/demos/photoviewer/main.cpp diff --git a/examples/declarative/photoviewer/photoviewer.desktop b/examples/declarative/demos/photoviewer/photoviewer.desktop index 4246b9f3..4246b9f3 100644 --- a/examples/declarative/photoviewer/photoviewer.desktop +++ b/examples/declarative/demos/photoviewer/photoviewer.desktop diff --git a/examples/declarative/photoviewer/photoviewer.pro b/examples/declarative/demos/photoviewer/photoviewer.pro index 5e7849f9..ac052881 100644 --- a/examples/declarative/photoviewer/photoviewer.pro +++ b/examples/declarative/demos/photoviewer/photoviewer.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/photoviewer +desktopInstallPrefix = $$[QT_INSTALL_EXAMPLES]/declarative/demos/photoviewer exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/photoviewer/photoviewer.qmlproject b/examples/declarative/demos/photoviewer/photoviewer.qmlproject index 025a3a8f..025a3a8f 100644 --- a/examples/declarative/photoviewer/photoviewer.qmlproject +++ b/examples/declarative/demos/photoviewer/photoviewer.qmlproject diff --git a/examples/declarative/photoviewer/photoviewer.svg b/examples/declarative/demos/photoviewer/photoviewer.svg index 566acfad..566acfad 100644 --- a/examples/declarative/photoviewer/photoviewer.svg +++ b/examples/declarative/demos/photoviewer/photoviewer.svg diff --git a/examples/declarative/photoviewer/photoviewer64.png b/examples/declarative/demos/photoviewer/photoviewer64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/declarative/photoviewer/photoviewer64.png +++ b/examples/declarative/demos/photoviewer/photoviewer64.png diff --git a/examples/declarative/photoviewer/photoviewer80.png b/examples/declarative/demos/photoviewer/photoviewer80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/declarative/photoviewer/photoviewer80.png +++ b/examples/declarative/demos/photoviewer/photoviewer80.png diff --git a/examples/declarative/photoviewer/photoviewer_harmattan.desktop b/examples/declarative/demos/photoviewer/photoviewer_harmattan.desktop index 2dced148..2dced148 100644 --- a/examples/declarative/photoviewer/photoviewer_harmattan.desktop +++ b/examples/declarative/demos/photoviewer/photoviewer_harmattan.desktop diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml index 696f1539..696f1539 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml index 7d5cd577..7d5cd577 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml index 76d39afc..76d39afc 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml index 1edcd575..1edcd575 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml index cace0588..cace0588 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml index 6fe73021..6fe73021 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml index 02c73a36..02c73a36 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml index af9e0fde..af9e0fde 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png Binary files differindex 431af854..431af854 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png Binary files differindex 664c2b14..664c2b14 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png Binary files differindex 1847ab52..1847ab52 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir index d3c247f2..d3c247f2 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir diff --git a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js index e8ef93a8..e8ef93a8 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js diff --git a/examples/declarative/photoviewer/qml/photoviewer/i18n/base.ts b/examples/declarative/demos/photoviewer/qml/photoviewer/i18n/base.ts index 1accfd2f..1accfd2f 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/i18n/base.ts +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/i18n/base.ts diff --git a/examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.qm b/examples/declarative/demos/photoviewer/qml/photoviewer/i18n/qml_fr.qm Binary files differindex c24fcbc4..c24fcbc4 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.qm +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/i18n/qml_fr.qm diff --git a/examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.ts b/examples/declarative/demos/photoviewer/qml/photoviewer/i18n/qml_fr.ts index 9f892db6..9f892db6 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.ts +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/i18n/qml_fr.ts diff --git a/examples/declarative/photoviewer/qml/photoviewer/photoviewer.qml b/examples/declarative/demos/photoviewer/qml/photoviewer/photoviewer.qml index 6c7285f7..6c7285f7 100644 --- a/examples/declarative/photoviewer/qml/photoviewer/photoviewer.qml +++ b/examples/declarative/demos/photoviewer/qml/photoviewer/photoviewer.qml diff --git a/examples/declarative/rssnews/main.cpp b/examples/declarative/demos/rssnews/main.cpp index d4066f73..d4066f73 100644 --- a/examples/declarative/rssnews/main.cpp +++ b/examples/declarative/demos/rssnews/main.cpp diff --git a/examples/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml b/examples/declarative/demos/rssnews/qml/rssnews/content/BusyIndicator.qml index 71e6c019..71e6c019 100644 --- a/examples/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml +++ b/examples/declarative/demos/rssnews/qml/rssnews/content/BusyIndicator.qml diff --git a/examples/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml b/examples/declarative/demos/rssnews/qml/rssnews/content/CategoryDelegate.qml index a1ad72c4..a1ad72c4 100644 --- a/examples/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml +++ b/examples/declarative/demos/rssnews/qml/rssnews/content/CategoryDelegate.qml diff --git a/examples/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml b/examples/declarative/demos/rssnews/qml/rssnews/content/NewsDelegate.qml index 3a3be14c..3a3be14c 100644 --- a/examples/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml +++ b/examples/declarative/demos/rssnews/qml/rssnews/content/NewsDelegate.qml diff --git a/examples/declarative/rssnews/qml/rssnews/content/RssFeeds.qml b/examples/declarative/demos/rssnews/qml/rssnews/content/RssFeeds.qml index c2285b25..c2285b25 100644 --- a/examples/declarative/rssnews/qml/rssnews/content/RssFeeds.qml +++ b/examples/declarative/demos/rssnews/qml/rssnews/content/RssFeeds.qml diff --git a/examples/declarative/rssnews/qml/rssnews/content/ScrollBar.qml b/examples/declarative/demos/rssnews/qml/rssnews/content/ScrollBar.qml index a873bd3e..a873bd3e 100644 --- a/examples/declarative/rssnews/qml/rssnews/content/ScrollBar.qml +++ b/examples/declarative/demos/rssnews/qml/rssnews/content/ScrollBar.qml diff --git a/examples/declarative/rssnews/qml/rssnews/content/images/busy.png b/examples/declarative/demos/rssnews/qml/rssnews/content/images/busy.png Binary files differindex 664c2b14..664c2b14 100644 --- a/examples/declarative/rssnews/qml/rssnews/content/images/busy.png +++ b/examples/declarative/demos/rssnews/qml/rssnews/content/images/busy.png diff --git a/examples/declarative/rssnews/qml/rssnews/content/images/scrollbar.png b/examples/declarative/demos/rssnews/qml/rssnews/content/images/scrollbar.png Binary files differindex 0228dcf9..0228dcf9 100644 --- a/examples/declarative/rssnews/qml/rssnews/content/images/scrollbar.png +++ b/examples/declarative/demos/rssnews/qml/rssnews/content/images/scrollbar.png diff --git a/examples/declarative/rssnews/qml/rssnews/rssnews.qml b/examples/declarative/demos/rssnews/qml/rssnews/rssnews.qml index e39e2f75..e39e2f75 100644 --- a/examples/declarative/rssnews/qml/rssnews/rssnews.qml +++ b/examples/declarative/demos/rssnews/qml/rssnews/rssnews.qml diff --git a/examples/declarative/rssnews/rssnews.desktop b/examples/declarative/demos/rssnews/rssnews.desktop index 7d02ed5f..7d02ed5f 100644 --- a/examples/declarative/rssnews/rssnews.desktop +++ b/examples/declarative/demos/rssnews/rssnews.desktop diff --git a/examples/declarative/rssnews/rssnews.pro b/examples/declarative/demos/rssnews/rssnews.pro index 57b81fe6..5cdb9a95 100644 --- a/examples/declarative/rssnews/rssnews.pro +++ b/examples/declarative/demos/rssnews/rssnews.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/rssnews +desktopInstallPrefix = $$[QT_INSTALL_EXAMPLES]/declarative/demos/rssnews exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/rssnews/rssnews.qmlproject b/examples/declarative/demos/rssnews/rssnews.qmlproject index 608be8d3..608be8d3 100644 --- a/examples/declarative/rssnews/rssnews.qmlproject +++ b/examples/declarative/demos/rssnews/rssnews.qmlproject diff --git a/examples/declarative/rssnews/rssnews.svg b/examples/declarative/demos/rssnews/rssnews.svg index 566acfad..566acfad 100644 --- a/examples/declarative/rssnews/rssnews.svg +++ b/examples/declarative/demos/rssnews/rssnews.svg diff --git a/examples/declarative/rssnews/rssnews64.png b/examples/declarative/demos/rssnews/rssnews64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/declarative/rssnews/rssnews64.png +++ b/examples/declarative/demos/rssnews/rssnews64.png diff --git a/examples/declarative/rssnews/rssnews80.png b/examples/declarative/demos/rssnews/rssnews80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/declarative/rssnews/rssnews80.png +++ b/examples/declarative/demos/rssnews/rssnews80.png diff --git a/examples/declarative/rssnews/rssnews_harmattan.desktop b/examples/declarative/demos/rssnews/rssnews_harmattan.desktop index df6303ff..df6303ff 100644 --- a/examples/declarative/rssnews/rssnews_harmattan.desktop +++ b/examples/declarative/demos/rssnews/rssnews_harmattan.desktop diff --git a/examples/declarative/samegame/main.cpp b/examples/declarative/demos/samegame/main.cpp index 27978404..27978404 100644 --- a/examples/declarative/samegame/main.cpp +++ b/examples/declarative/demos/samegame/main.cpp diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/BoomBlock.qml index 0e3b41cc..0e3b41cc 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/BoomBlock.qml diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/Button.qml b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/Button.qml index 1b9da226..1b9da226 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/Button.qml +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/Button.qml diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/Dialog.qml index a7e02244..a7e02244 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/Dialog.qml diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/background.png b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/background.png Binary files differindex 3734a277..3734a277 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/background.png +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/background.png diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStar.png b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/blueStar.png Binary files differindex ff9588f8..ff9588f8 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStar.png +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/blueStar.png diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStone.png b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/blueStone.png Binary files differindex 20e43c75..20e43c75 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStone.png +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/blueStone.png diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStar.png b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/greenStar.png Binary files differindex cd068547..cd068547 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStar.png +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/greenStar.png diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStone.png b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/greenStone.png Binary files differindex b568a190..b568a190 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStone.png +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/greenStone.png diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStar.png b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/redStar.png Binary files differindex 0a4dffe5..0a4dffe5 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStar.png +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/redStar.png diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStone.png b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/redStone.png Binary files differindex 36b09a26..36b09a26 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStone.png +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/redStone.png diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/star.png b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/star.png Binary files differindex defbde53..defbde53 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/star.png +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/star.png diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/yellowStone.png b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/yellowStone.png Binary files differindex b1ce7621..b1ce7621 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/pics/yellowStone.png +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/pics/yellowStone.png diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/qmldir b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/qmldir index e17b1f5d..e17b1f5d 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/qmldir +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/qmldir diff --git a/examples/declarative/samegame/qml/samegame/SamegameCore/samegame.js b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/samegame.js index d7b827a1..d7b827a1 100644 --- a/examples/declarative/samegame/qml/samegame/SamegameCore/samegame.js +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/samegame.js diff --git a/examples/declarative/samegame/qml/samegame/highscores/README b/examples/declarative/demos/samegame/qml/samegame/highscores/README index eaa00fae..eaa00fae 100644 --- a/examples/declarative/samegame/qml/samegame/highscores/README +++ b/examples/declarative/demos/samegame/qml/samegame/highscores/README diff --git a/examples/declarative/samegame/qml/samegame/highscores/score_data.xml b/examples/declarative/demos/samegame/qml/samegame/highscores/score_data.xml index c3fd90d9..c3fd90d9 100644 --- a/examples/declarative/samegame/qml/samegame/highscores/score_data.xml +++ b/examples/declarative/demos/samegame/qml/samegame/highscores/score_data.xml diff --git a/examples/declarative/samegame/qml/samegame/highscores/score_style.xsl b/examples/declarative/demos/samegame/qml/samegame/highscores/score_style.xsl index 670354c9..670354c9 100644 --- a/examples/declarative/samegame/qml/samegame/highscores/score_style.xsl +++ b/examples/declarative/demos/samegame/qml/samegame/highscores/score_style.xsl diff --git a/examples/declarative/samegame/qml/samegame/highscores/scores.php b/examples/declarative/demos/samegame/qml/samegame/highscores/scores.php index 3cceb2d7..3cceb2d7 100644 --- a/examples/declarative/samegame/qml/samegame/highscores/scores.php +++ b/examples/declarative/demos/samegame/qml/samegame/highscores/scores.php diff --git a/examples/declarative/samegame/qml/samegame/samegame.qml b/examples/declarative/demos/samegame/qml/samegame/samegame.qml index db8016fc..db8016fc 100644 --- a/examples/declarative/samegame/qml/samegame/samegame.qml +++ b/examples/declarative/demos/samegame/qml/samegame/samegame.qml diff --git a/examples/declarative/samegame/samegame.desktop b/examples/declarative/demos/samegame/samegame.desktop index 18ad2d98..18ad2d98 100644 --- a/examples/declarative/samegame/samegame.desktop +++ b/examples/declarative/demos/samegame/samegame.desktop diff --git a/examples/declarative/samegame/samegame.pro b/examples/declarative/demos/samegame/samegame.pro index baac5dc1..4df17a37 100644 --- a/examples/declarative/samegame/samegame.pro +++ b/examples/declarative/demos/samegame/samegame.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/samegame +desktopInstallPrefix = $$[QT_INSTALL_EXAMPLES]/declarative/demos/samegame exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/samegame/samegame.qmlproject b/examples/declarative/demos/samegame/samegame.qmlproject index c17ee1ee..c17ee1ee 100644 --- a/examples/declarative/samegame/samegame.qmlproject +++ b/examples/declarative/demos/samegame/samegame.qmlproject diff --git a/examples/declarative/samegame/samegame.svg b/examples/declarative/demos/samegame/samegame.svg index 566acfad..566acfad 100644 --- a/examples/declarative/samegame/samegame.svg +++ b/examples/declarative/demos/samegame/samegame.svg diff --git a/examples/declarative/samegame/samegame64.png b/examples/declarative/demos/samegame/samegame64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/declarative/samegame/samegame64.png +++ b/examples/declarative/demos/samegame/samegame64.png diff --git a/examples/declarative/samegame/samegame80.png b/examples/declarative/demos/samegame/samegame80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/declarative/samegame/samegame80.png +++ b/examples/declarative/demos/samegame/samegame80.png diff --git a/examples/declarative/samegame/samegame_harmattan.desktop b/examples/declarative/demos/samegame/samegame_harmattan.desktop index 1f35b8e3..1f35b8e3 100644 --- a/examples/declarative/samegame/samegame_harmattan.desktop +++ b/examples/declarative/demos/samegame/samegame_harmattan.desktop diff --git a/examples/declarative/snake/main.cpp b/examples/declarative/demos/snake/main.cpp index cea869c1..cea869c1 100644 --- a/examples/declarative/snake/main.cpp +++ b/examples/declarative/demos/snake/main.cpp diff --git a/examples/declarative/snake/qml/snake/content/Button.qml b/examples/declarative/demos/snake/qml/snake/content/Button.qml index 322431d3..322431d3 100644 --- a/examples/declarative/snake/qml/snake/content/Button.qml +++ b/examples/declarative/demos/snake/qml/snake/content/Button.qml diff --git a/examples/declarative/snake/qml/snake/content/Cookie.qml b/examples/declarative/demos/snake/qml/snake/content/Cookie.qml index d101445a..d101445a 100644 --- a/examples/declarative/snake/qml/snake/content/Cookie.qml +++ b/examples/declarative/demos/snake/qml/snake/content/Cookie.qml diff --git a/examples/declarative/snake/qml/snake/content/HighScoreModel.qml b/examples/declarative/demos/snake/qml/snake/content/HighScoreModel.qml index c9a81831..c9a81831 100644 --- a/examples/declarative/snake/qml/snake/content/HighScoreModel.qml +++ b/examples/declarative/demos/snake/qml/snake/content/HighScoreModel.qml diff --git a/examples/declarative/snake/qml/snake/content/Link.qml b/examples/declarative/demos/snake/qml/snake/content/Link.qml index f5658e95..f5658e95 100644 --- a/examples/declarative/snake/qml/snake/content/Link.qml +++ b/examples/declarative/demos/snake/qml/snake/content/Link.qml diff --git a/examples/declarative/snake/qml/snake/content/Skull.qml b/examples/declarative/demos/snake/qml/snake/content/Skull.qml index 4242b708..4242b708 100644 --- a/examples/declarative/snake/qml/snake/content/Skull.qml +++ b/examples/declarative/demos/snake/qml/snake/content/Skull.qml diff --git a/examples/declarative/snake/qml/snake/content/pics/README b/examples/declarative/demos/snake/qml/snake/content/pics/README index 0215132c..0215132c 100644 --- a/examples/declarative/snake/qml/snake/content/pics/README +++ b/examples/declarative/demos/snake/qml/snake/content/pics/README diff --git a/examples/declarative/snake/qml/snake/content/pics/background.png b/examples/declarative/demos/snake/qml/snake/content/pics/background.png Binary files differindex 72dffaa8..72dffaa8 100644 --- a/examples/declarative/snake/qml/snake/content/pics/background.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/background.png diff --git a/examples/declarative/snake/qml/snake/content/pics/blueStar.png b/examples/declarative/demos/snake/qml/snake/content/pics/blueStar.png Binary files differindex ba7acabd..ba7acabd 100644 --- a/examples/declarative/snake/qml/snake/content/pics/blueStar.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/blueStar.png diff --git a/examples/declarative/snake/qml/snake/content/pics/blueStone.png b/examples/declarative/demos/snake/qml/snake/content/pics/blueStone.png Binary files differindex 356affdd..356affdd 100644 --- a/examples/declarative/snake/qml/snake/content/pics/blueStone.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/blueStone.png diff --git a/examples/declarative/snake/qml/snake/content/pics/cookie.png b/examples/declarative/demos/snake/qml/snake/content/pics/cookie.png Binary files differindex aec2957f..aec2957f 100644 --- a/examples/declarative/snake/qml/snake/content/pics/cookie.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/cookie.png diff --git a/examples/declarative/snake/qml/snake/content/pics/eyes.svg b/examples/declarative/demos/snake/qml/snake/content/pics/eyes.svg index 10786927..10786927 100644 --- a/examples/declarative/snake/qml/snake/content/pics/eyes.svg +++ b/examples/declarative/demos/snake/qml/snake/content/pics/eyes.svg diff --git a/examples/declarative/snake/qml/snake/content/pics/head.png b/examples/declarative/demos/snake/qml/snake/content/pics/head.png Binary files differindex 550e0026..550e0026 100644 --- a/examples/declarative/snake/qml/snake/content/pics/head.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/head.png diff --git a/examples/declarative/snake/qml/snake/content/pics/head.svg b/examples/declarative/demos/snake/qml/snake/content/pics/head.svg index 3bf0bd2f..3bf0bd2f 100644 --- a/examples/declarative/snake/qml/snake/content/pics/head.svg +++ b/examples/declarative/demos/snake/qml/snake/content/pics/head.svg diff --git a/examples/declarative/snake/qml/snake/content/pics/pause.png b/examples/declarative/demos/snake/qml/snake/content/pics/pause.png Binary files differindex 056d97dd..056d97dd 100644 --- a/examples/declarative/snake/qml/snake/content/pics/pause.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/pause.png diff --git a/examples/declarative/snake/qml/snake/content/pics/redStar.png b/examples/declarative/demos/snake/qml/snake/content/pics/redStar.png Binary files differindex cd068547..cd068547 100644 --- a/examples/declarative/snake/qml/snake/content/pics/redStar.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/redStar.png diff --git a/examples/declarative/snake/qml/snake/content/pics/redStone.png b/examples/declarative/demos/snake/qml/snake/content/pics/redStone.png Binary files differindex 9bb7fe42..9bb7fe42 100644 --- a/examples/declarative/snake/qml/snake/content/pics/redStone.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/redStone.png diff --git a/examples/declarative/snake/qml/snake/content/pics/skull.png b/examples/declarative/demos/snake/qml/snake/content/pics/skull.png Binary files differindex 63186167..63186167 100644 --- a/examples/declarative/snake/qml/snake/content/pics/skull.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/skull.png diff --git a/examples/declarative/snake/qml/snake/content/pics/snake.jpg b/examples/declarative/demos/snake/qml/snake/content/pics/snake.jpg Binary files differindex e91a784f..e91a784f 100644 --- a/examples/declarative/snake/qml/snake/content/pics/snake.jpg +++ b/examples/declarative/demos/snake/qml/snake/content/pics/snake.jpg diff --git a/examples/declarative/snake/qml/snake/content/pics/star.png b/examples/declarative/demos/snake/qml/snake/content/pics/star.png Binary files differindex defbde53..defbde53 100644 --- a/examples/declarative/snake/qml/snake/content/pics/star.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/star.png diff --git a/examples/declarative/snake/qml/snake/content/pics/stoneShadow.png b/examples/declarative/demos/snake/qml/snake/content/pics/stoneShadow.png Binary files differindex 1bd56afd..1bd56afd 100644 --- a/examples/declarative/snake/qml/snake/content/pics/stoneShadow.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/stoneShadow.png diff --git a/examples/declarative/snake/qml/snake/content/pics/yellowStar.png b/examples/declarative/demos/snake/qml/snake/content/pics/yellowStar.png Binary files differindex 52fb9c4b..52fb9c4b 100644 --- a/examples/declarative/snake/qml/snake/content/pics/yellowStar.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/yellowStar.png diff --git a/examples/declarative/snake/qml/snake/content/pics/yellowStone.png b/examples/declarative/demos/snake/qml/snake/content/pics/yellowStone.png Binary files differindex c56124a8..c56124a8 100644 --- a/examples/declarative/snake/qml/snake/content/pics/yellowStone.png +++ b/examples/declarative/demos/snake/qml/snake/content/pics/yellowStone.png diff --git a/examples/declarative/snake/qml/snake/content/snake.js b/examples/declarative/demos/snake/qml/snake/content/snake.js index 837b82ad..837b82ad 100644 --- a/examples/declarative/snake/qml/snake/content/snake.js +++ b/examples/declarative/demos/snake/qml/snake/content/snake.js diff --git a/examples/declarative/snake/qml/snake/snake.qml b/examples/declarative/demos/snake/qml/snake/snake.qml index b5e386d6..b5e386d6 100644 --- a/examples/declarative/snake/qml/snake/snake.qml +++ b/examples/declarative/demos/snake/qml/snake/snake.qml diff --git a/examples/declarative/snake/snake.desktop b/examples/declarative/demos/snake/snake.desktop index fef60907..fef60907 100644 --- a/examples/declarative/snake/snake.desktop +++ b/examples/declarative/demos/snake/snake.desktop diff --git a/examples/declarative/snake/snake.pro b/examples/declarative/demos/snake/snake.pro index ce1e28e3..59b17747 100644 --- a/examples/declarative/snake/snake.pro +++ b/examples/declarative/demos/snake/snake.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/snake +desktopInstallPrefix = $$[QT_INSTALL_EXAMPLES]/declarative/demos/snake exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/snake/snake.qmlproject b/examples/declarative/demos/snake/snake.qmlproject index 431d2a9e..431d2a9e 100644 --- a/examples/declarative/snake/snake.qmlproject +++ b/examples/declarative/demos/snake/snake.qmlproject diff --git a/examples/declarative/snake/snake.svg b/examples/declarative/demos/snake/snake.svg index 566acfad..566acfad 100644 --- a/examples/declarative/snake/snake.svg +++ b/examples/declarative/demos/snake/snake.svg diff --git a/examples/declarative/snake/snake64.png b/examples/declarative/demos/snake/snake64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/declarative/snake/snake64.png +++ b/examples/declarative/demos/snake/snake64.png diff --git a/examples/declarative/snake/snake80.png b/examples/declarative/demos/snake/snake80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/declarative/snake/snake80.png +++ b/examples/declarative/demos/snake/snake80.png diff --git a/examples/declarative/snake/snake_harmattan.desktop b/examples/declarative/demos/snake/snake_harmattan.desktop index 10b0f792..10b0f792 100644 --- a/examples/declarative/snake/snake_harmattan.desktop +++ b/examples/declarative/demos/snake/snake_harmattan.desktop diff --git a/examples/declarative/twitter/main.cpp b/examples/declarative/demos/twitter/main.cpp index 0a7a07f9..0a7a07f9 100644 --- a/examples/declarative/twitter/main.cpp +++ b/examples/declarative/demos/twitter/main.cpp diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/Button.qml b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/Button.qml index 794ba267..794ba267 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/Button.qml +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/Button.qml diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/FatDelegate.qml index 08a01c09..08a01c09 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/FatDelegate.qml diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/Input.qml b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/Input.qml index aa090407..aa090407 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/Input.qml +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/Input.qml diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/Loading.qml b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/Loading.qml index 8520e150..8520e150 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/Loading.qml +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/Loading.qml diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml index 2f91399d..2f91399d 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/RssModel.qml index 1d2fe52b..1d2fe52b 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/RssModel.qml diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/SearchView.qml index 3991f06b..3991f06b 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/SearchView.qml diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/TitleBar.qml index 343e8797..343e8797 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/TitleBar.qml diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/ToolBar.qml index 1b0df39a..1b0df39a 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/ToolBar.qml diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/UserModel.qml index 0f5b48d0..0f5b48d0 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/UserModel.qml diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/images/gloss.png b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/gloss.png Binary files differindex 5d370cd9..5d370cd9 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/images/gloss.png +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/gloss.png diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.png b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/lineedit.png Binary files differindex 2cc38dc3..2cc38dc3 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.png +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/lineedit.png diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.sci b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/lineedit.sci index 054bff78..054bff78 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.sci +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/lineedit.sci diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/images/loading.png b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/loading.png Binary files differindex 47a1589c..47a1589c 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/images/loading.png +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/loading.png diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/images/quit.png b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/quit.png Binary files differindex 5bda1b6e..5bda1b6e 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/images/quit.png +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/quit.png diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/images/stripes.png b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/stripes.png Binary files differindex 9f36727e..9f36727e 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/images/stripes.png +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/stripes.png diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.png b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/titlebar.png Binary files differindex 51c90082..51c90082 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.png +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/titlebar.png diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.sci b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/titlebar.sci index 0418d94c..0418d94c 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.sci +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/titlebar.sci diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.png b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.png Binary files differindex 11310013..11310013 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.png +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.png diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.sci b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.sci index 9e4f9653..9e4f9653 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.sci +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.sci diff --git a/examples/declarative/twitter/qml/twitter/TwitterCore/qmldir b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/qmldir index 84d85c28..84d85c28 100644 --- a/examples/declarative/twitter/qml/twitter/TwitterCore/qmldir +++ b/examples/declarative/demos/twitter/qml/twitter/TwitterCore/qmldir diff --git a/examples/declarative/twitter/qml/twitter/twitter.qml b/examples/declarative/demos/twitter/qml/twitter/twitter.qml index 8efc0765..8efc0765 100644 --- a/examples/declarative/twitter/qml/twitter/twitter.qml +++ b/examples/declarative/demos/twitter/qml/twitter/twitter.qml diff --git a/examples/declarative/twitter/twitter.desktop b/examples/declarative/demos/twitter/twitter.desktop index 5d1b851b..5d1b851b 100644 --- a/examples/declarative/twitter/twitter.desktop +++ b/examples/declarative/demos/twitter/twitter.desktop diff --git a/examples/declarative/twitter/twitter.pro b/examples/declarative/demos/twitter/twitter.pro index 68ece226..26d928ee 100644 --- a/examples/declarative/twitter/twitter.pro +++ b/examples/declarative/demos/twitter/twitter.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/twitter +desktopInstallPrefix = $$[QT_INSTALL_EXAMPLES]/declarative/demos/twitter exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/twitter/twitter.qmlproject b/examples/declarative/demos/twitter/twitter.qmlproject index 3b360cf2..3b360cf2 100644 --- a/examples/declarative/twitter/twitter.qmlproject +++ b/examples/declarative/demos/twitter/twitter.qmlproject diff --git a/examples/declarative/twitter/twitter.svg b/examples/declarative/demos/twitter/twitter.svg index 566acfad..566acfad 100644 --- a/examples/declarative/twitter/twitter.svg +++ b/examples/declarative/demos/twitter/twitter.svg diff --git a/examples/declarative/twitter/twitter64.png b/examples/declarative/demos/twitter/twitter64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/declarative/twitter/twitter64.png +++ b/examples/declarative/demos/twitter/twitter64.png diff --git a/examples/declarative/twitter/twitter80.png b/examples/declarative/demos/twitter/twitter80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/declarative/twitter/twitter80.png +++ b/examples/declarative/demos/twitter/twitter80.png diff --git a/examples/declarative/twitter/twitter_harmattan.desktop b/examples/declarative/demos/twitter/twitter_harmattan.desktop index 40a4a1bc..40a4a1bc 100644 --- a/examples/declarative/twitter/twitter_harmattan.desktop +++ b/examples/declarative/demos/twitter/twitter_harmattan.desktop |