diff options
-rw-r--r-- | demos/declarative/declarative.pro | 20 | ||||
-rw-r--r-- | demos/declarative/demos.qmlproject | 16 | ||||
-rw-r--r-- | demos/demos.pro | 2 | ||||
-rw-r--r-- | examples/declarative/calculator/Core/Button.qml (renamed from demos/declarative/calculator/Core/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/Core/Display.qml (renamed from demos/declarative/calculator/Core/Display.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/Core/calculator.js (renamed from demos/declarative/calculator/Core/calculator.js) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/Core/images/button-.png (renamed from demos/declarative/calculator/Core/images/button-.png) | bin | 1288 -> 1288 bytes | |||
-rw-r--r-- | examples/declarative/calculator/Core/images/button-blue.png (renamed from demos/declarative/calculator/Core/images/button-blue.png) | bin | 1565 -> 1565 bytes | |||
-rw-r--r-- | examples/declarative/calculator/Core/images/button-green.png (renamed from demos/declarative/calculator/Core/images/button-green.png) | bin | 1543 -> 1543 bytes | |||
-rw-r--r-- | examples/declarative/calculator/Core/images/button-purple.png (renamed from demos/declarative/calculator/Core/images/button-purple.png) | bin | 1566 -> 1566 bytes | |||
-rw-r--r-- | examples/declarative/calculator/Core/images/button-red.png (renamed from demos/declarative/calculator/Core/images/button-red.png) | bin | 1586 -> 1586 bytes | |||
-rw-r--r-- | examples/declarative/calculator/Core/images/display.png (renamed from demos/declarative/calculator/Core/images/display.png) | bin | 998 -> 998 bytes | |||
-rw-r--r-- | examples/declarative/calculator/Core/qmldir (renamed from demos/declarative/calculator/Core/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/calculator.qml (renamed from demos/declarative/calculator/calculator.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/calculator.qmlproject (renamed from demos/declarative/calculator/calculator.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/declarative.pro | 14 | ||||
-rw-r--r-- | examples/declarative/flickr/content/Button.qml (renamed from demos/declarative/flickr/content/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/GridDelegate.qml (renamed from demos/declarative/flickr/content/GridDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/ImageDetails.qml (renamed from demos/declarative/flickr/content/ImageDetails.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/ListDelegate.qml (renamed from demos/declarative/flickr/content/ListDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/Progress.qml (renamed from demos/declarative/flickr/content/Progress.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/RssModel.qml (renamed from demos/declarative/flickr/content/RssModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/ScrollBar.qml (renamed from demos/declarative/flickr/content/ScrollBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/Slider.qml (renamed from demos/declarative/flickr/content/Slider.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/StreamView.qml (renamed from demos/declarative/flickr/content/StreamView.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/TitleBar.qml (renamed from demos/declarative/flickr/content/TitleBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/ToolBar.qml (renamed from demos/declarative/flickr/content/ToolBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/UnifiedDelegate.qml (renamed from demos/declarative/flickr/content/UnifiedDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/images/gloss.png (renamed from demos/declarative/flickr/content/images/gloss.png) | bin | 1236 -> 1236 bytes | |||
-rw-r--r-- | examples/declarative/flickr/content/images/lineedit.png (renamed from demos/declarative/flickr/content/images/lineedit.png) | bin | 1415 -> 1415 bytes | |||
-rw-r--r-- | examples/declarative/flickr/content/images/lineedit.sci (renamed from demos/declarative/flickr/content/images/lineedit.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/images/noise.png (renamed from demos/declarative/flickr/content/images/noise.png) | bin | 25447 -> 25447 bytes | |||
-rw-r--r-- | examples/declarative/flickr/content/images/particle.png (renamed from demos/declarative/flickr/content/images/particle.png) | bin | 5148 -> 5148 bytes | |||
-rw-r--r-- | examples/declarative/flickr/content/images/quit.png (renamed from demos/declarative/flickr/content/images/quit.png) | bin | 2369 -> 2369 bytes | |||
-rw-r--r-- | examples/declarative/flickr/content/images/squareParticle.png (renamed from demos/declarative/flickr/content/images/squareParticle.png) | bin | 933 -> 933 bytes | |||
-rw-r--r-- | examples/declarative/flickr/content/images/stripes.png (renamed from demos/declarative/flickr/content/images/stripes.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | examples/declarative/flickr/content/images/titlebar.png (renamed from demos/declarative/flickr/content/images/titlebar.png) | bin | 1436 -> 1436 bytes | |||
-rw-r--r-- | examples/declarative/flickr/content/images/titlebar.sci (renamed from demos/declarative/flickr/content/images/titlebar.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/images/toolbutton.png (renamed from demos/declarative/flickr/content/images/toolbutton.png) | bin | 2550 -> 2550 bytes | |||
-rw-r--r-- | examples/declarative/flickr/content/images/toolbutton.sci (renamed from demos/declarative/flickr/content/images/toolbutton.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/content/qmldir (renamed from demos/declarative/flickr/content/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/flickr-90.qml (renamed from demos/declarative/flickr/flickr-90.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/flickr.qml (renamed from demos/declarative/flickr/flickr.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/flickr.qmlproject (renamed from demos/declarative/flickr/flickr.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/Explosion.qml (renamed from demos/declarative/minehunt/MinehuntCore/Explosion.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/Tile.qml (renamed from demos/declarative/minehunt/MinehuntCore/Tile.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/back.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/back.png) | bin | 558 -> 558 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/background.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/background.png) | bin | 313930 -> 313930 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/bomb-color.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/bomb-color.png) | bin | 284 -> 284 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/bomb.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/bomb.png) | bin | 535 -> 535 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/face-sad.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/face-sad.png) | bin | 14844 -> 14844 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/face-smile-big.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/face-smile-big.png) | bin | 13810 -> 13810 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/face-smile.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/face-smile.png) | bin | 15408 -> 15408 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/flag-color.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/flag-color.png) | bin | 219 -> 219 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/flag.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/flag.png) | bin | 196 -> 196 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/front.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/front.png) | bin | 580 -> 580 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/quit.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/quit.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/pics/star.png (renamed from demos/declarative/minehunt/MinehuntCore/pics/star.png) | bin | 2677 -> 2677 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/MinehuntCore/qmldir (renamed from demos/declarative/minehunt/MinehuntCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/README (renamed from demos/declarative/minehunt/README) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/main.cpp (renamed from demos/declarative/minehunt/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.cpp (renamed from demos/declarative/minehunt/minehunt.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.h (renamed from demos/declarative/minehunt/minehunt.h) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.pro (renamed from demos/declarative/minehunt/minehunt.pro) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.qml (renamed from demos/declarative/minehunt/minehunt.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.qmlproject (renamed from demos/declarative/minehunt/minehunt.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.qrc (renamed from demos/declarative/minehunt/minehunt.qrc) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml (renamed from demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml (renamed from demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/Button.qml (renamed from demos/declarative/photoviewer/PhotoViewerCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/EditableButton.qml (renamed from demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml (renamed from demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml (renamed from demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml (renamed from demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/Tag.qml (renamed from demos/declarative/photoviewer/PhotoViewerCore/Tag.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png (renamed from demos/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png) | bin | 588 -> 588 bytes | |||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/images/busy.png (renamed from demos/declarative/photoviewer/PhotoViewerCore/images/busy.png) | bin | 2629 -> 2629 bytes | |||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/images/cardboard.png (renamed from demos/declarative/photoviewer/PhotoViewerCore/images/cardboard.png) | bin | 8844 -> 8844 bytes | |||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/qmldir (renamed from demos/declarative/photoviewer/PhotoViewerCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/PhotoViewerCore/script/script.js (renamed from demos/declarative/photoviewer/PhotoViewerCore/script/script.js) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/i18n/base.ts (renamed from demos/declarative/photoviewer/i18n/base.ts) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/i18n/qml_fr.qm (renamed from demos/declarative/photoviewer/i18n/qml_fr.qm) | bin | 268 -> 268 bytes | |||
-rw-r--r-- | examples/declarative/photoviewer/i18n/qml_fr.ts (renamed from demos/declarative/photoviewer/i18n/qml_fr.ts) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/photoviewer.qml (renamed from demos/declarative/photoviewer/photoviewer.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/photoviewer.qmlproject (renamed from demos/declarative/photoviewer/photoviewer.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/PlasmaPatrol.qmlproject (renamed from demos/declarative/plasmapatrol/PlasmaPatrol.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/TODO (renamed from demos/declarative/plasmapatrol/TODO) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/BlasterHardpoint.qml (renamed from demos/declarative/plasmapatrol/content/BlasterHardpoint.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/Button.qml (renamed from demos/declarative/plasmapatrol/content/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/CannonHardpoint.qml (renamed from demos/declarative/plasmapatrol/content/CannonHardpoint.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/ChoiceBox.qml (renamed from demos/declarative/plasmapatrol/content/ChoiceBox.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/Cruiser.qml (renamed from demos/declarative/plasmapatrol/content/Cruiser.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/Frigate.qml (renamed from demos/declarative/plasmapatrol/content/Frigate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/Hardpoint.qml (renamed from demos/declarative/plasmapatrol/content/Hardpoint.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/HelpScreens.qml (renamed from demos/declarative/plasmapatrol/content/HelpScreens.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/LaserHardpoint.qml (renamed from demos/declarative/plasmapatrol/content/LaserHardpoint.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml (renamed from demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/SequentialLoader.qml (renamed from demos/declarative/plasmapatrol/content/SequentialLoader.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/Ship.qml (renamed from demos/declarative/plasmapatrol/content/Ship.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/Sloop.qml (renamed from demos/declarative/plasmapatrol/content/Sloop.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/plasmapatrol/content/pics/TitleText.png (renamed from demos/declarative/plasmapatrol/content/pics/TitleText.png) | bin | 1109 -> 1109 bytes | |||
-rw-r--r-- | examples/declarative/plasmapatrol/content/pics/blur-circle2.png (renamed from demos/declarative/plasmapatrol/content/pics/blur-circle2.png) | bin | 3627 -> 3627 bytes | |||
-rw-r--r-- | examples/declarative/plasmapatrol/content/pics/blur-circle3.png (renamed from demos/declarative/plasmapatrol/content/pics/blur-circle3.png) | bin | 5148 -> 5148 bytes | |||
-rw-r--r-- | examples/declarative/plasmapatrol/content/pics/finalfrontier.png (renamed from demos/declarative/plasmapatrol/content/pics/finalfrontier.png) | bin | 695061 -> 695061 bytes | |||
-rw-r--r-- | examples/declarative/plasmapatrol/content/pics/meteor.png (renamed from demos/declarative/plasmapatrol/content/pics/meteor.png) | bin | 83169 -> 83169 bytes | |||
-rw-r--r-- | examples/declarative/plasmapatrol/content/pics/meteor_explo.png (renamed from demos/declarative/plasmapatrol/content/pics/meteor_explo.png) | bin | 81528 -> 81528 bytes | |||
-rw-r--r-- | examples/declarative/plasmapatrol/content/pics/nullRock.png (renamed from demos/declarative/plasmapatrol/content/pics/nullRock.png) | bin | 140 -> 140 bytes | |||
-rw-r--r-- | examples/declarative/plasmapatrol/content/pics/particle.png (renamed from demos/declarative/plasmapatrol/content/pics/particle.png) | bin | 861 -> 861 bytes | |||
-rw-r--r-- | examples/declarative/plasmapatrol/content/pics/star.png (renamed from demos/declarative/plasmapatrol/content/pics/star.png) | bin | 1550 -> 1550 bytes | |||
-rw-r--r-- | examples/declarative/plasmapatrol/content/pics/star2.png (renamed from demos/declarative/plasmapatrol/content/pics/star2.png) | bin | 6507 -> 6507 bytes | |||
-rw-r--r-- | examples/declarative/plasmapatrol/content/pics/star3.png (renamed from demos/declarative/plasmapatrol/content/pics/star3.png) | bin | 4602 -> 4602 bytes | |||
-rw-r--r-- | examples/declarative/plasmapatrol/plasmapatrol.qml (renamed from demos/declarative/plasmapatrol/plasmapatrol.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/content/BusyIndicator.qml (renamed from demos/declarative/rssnews/content/BusyIndicator.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/content/CategoryDelegate.qml (renamed from demos/declarative/rssnews/content/CategoryDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/content/NewsDelegate.qml (renamed from demos/declarative/rssnews/content/NewsDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/content/RssFeeds.qml (renamed from demos/declarative/rssnews/content/RssFeeds.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/content/ScrollBar.qml (renamed from demos/declarative/rssnews/content/ScrollBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/content/images/busy.png (renamed from demos/declarative/rssnews/content/images/busy.png) | bin | 2629 -> 2629 bytes | |||
-rw-r--r-- | examples/declarative/rssnews/content/images/scrollbar.png (renamed from demos/declarative/rssnews/content/images/scrollbar.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | examples/declarative/rssnews/rssnews.qml (renamed from demos/declarative/rssnews/rssnews.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/rssnews.qmlproject (renamed from demos/declarative/rssnews/rssnews.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/SamegameCore/BoomBlock.qml (renamed from demos/declarative/samegame/SamegameCore/BoomBlock.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/SamegameCore/Button.qml (renamed from demos/declarative/samegame/SamegameCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/SamegameCore/Dialog.qml (renamed from demos/declarative/samegame/SamegameCore/Dialog.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/SamegameCore/pics/background.png (renamed from demos/declarative/samegame/SamegameCore/pics/background.png) | bin | 313930 -> 313930 bytes | |||
-rw-r--r-- | examples/declarative/samegame/SamegameCore/pics/blueStone.png (renamed from demos/declarative/samegame/SamegameCore/pics/blueStone.png) | bin | 3054 -> 3054 bytes | |||
-rw-r--r-- | examples/declarative/samegame/SamegameCore/pics/greenStone.png (renamed from demos/declarative/samegame/SamegameCore/pics/greenStone.png) | bin | 2932 -> 2932 bytes | |||
-rw-r--r-- | examples/declarative/samegame/SamegameCore/pics/particle.png (renamed from demos/declarative/samegame/SamegameCore/pics/particle.png) | bin | 861 -> 861 bytes | |||
-rw-r--r-- | examples/declarative/samegame/SamegameCore/pics/redStone.png (renamed from demos/declarative/samegame/SamegameCore/pics/redStone.png) | bin | 2902 -> 2902 bytes | |||
-rw-r--r-- | examples/declarative/samegame/SamegameCore/pics/yellowStone.png (renamed from demos/declarative/samegame/SamegameCore/pics/yellowStone.png) | bin | 3056 -> 3056 bytes | |||
-rw-r--r-- | examples/declarative/samegame/SamegameCore/qmldir (renamed from demos/declarative/samegame/SamegameCore/qmldir) | 0 | ||||
-rwxr-xr-x | examples/declarative/samegame/SamegameCore/samegame.js (renamed from demos/declarative/samegame/SamegameCore/samegame.js) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/highscores/README (renamed from demos/declarative/samegame/highscores/README) | 0 | ||||
-rwxr-xr-x | examples/declarative/samegame/highscores/score_data.xml (renamed from demos/declarative/samegame/highscores/score_data.xml) | 0 | ||||
-rwxr-xr-x | examples/declarative/samegame/highscores/score_style.xsl (renamed from demos/declarative/samegame/highscores/score_style.xsl) | 0 | ||||
-rwxr-xr-x | examples/declarative/samegame/highscores/scores.php (renamed from demos/declarative/samegame/highscores/scores.php) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/samegame.qml (renamed from demos/declarative/samegame/samegame.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/samegame.qmlproject (renamed from demos/declarative/samegame/samegame.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/shadereffects/Slider.qml (renamed from demos/declarative/shadereffects/Slider.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/shadereffects/face-smile.png (renamed from demos/declarative/shadereffects/face-smile.png) | bin | 15408 -> 15408 bytes | |||
-rw-r--r-- | examples/declarative/shadereffects/qt-logo.png (renamed from demos/declarative/shadereffects/qt-logo.png) | bin | 13923 -> 13923 bytes | |||
-rw-r--r-- | examples/declarative/shadereffects/shader-demo.qml (renamed from demos/declarative/shadereffects/shader-demo.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/content/Button.qml (renamed from demos/declarative/snake/content/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/content/Cookie.qml (renamed from demos/declarative/snake/content/Cookie.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/content/HighScoreModel.qml (renamed from demos/declarative/snake/content/HighScoreModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/content/Link.qml (renamed from demos/declarative/snake/content/Link.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/content/Skull.qml (renamed from demos/declarative/snake/content/Skull.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/content/pics/README (renamed from demos/declarative/snake/content/pics/README) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/content/pics/background.png (renamed from demos/declarative/snake/content/pics/background.png) | bin | 144508 -> 144508 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/blueStar.png (renamed from demos/declarative/snake/content/pics/blueStar.png) | bin | 272 -> 272 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/blueStone.png (renamed from demos/declarative/snake/content/pics/blueStone.png) | bin | 3139 -> 3139 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/cookie.png (renamed from demos/declarative/snake/content/pics/cookie.png) | bin | 2729 -> 2729 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/eyes.svg (renamed from demos/declarative/snake/content/pics/eyes.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/content/pics/head.png (renamed from demos/declarative/snake/content/pics/head.png) | bin | 3473 -> 3473 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/head.svg (renamed from demos/declarative/snake/content/pics/head.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/content/pics/pause.png (renamed from demos/declarative/snake/content/pics/pause.png) | bin | 4327 -> 4327 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/redStar.png (renamed from demos/declarative/snake/content/pics/redStar.png) | bin | 273 -> 273 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/redStone.png (renamed from demos/declarative/snake/content/pics/redStone.png) | bin | 3456 -> 3456 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/skull.png (renamed from demos/declarative/snake/content/pics/skull.png) | bin | 2543 -> 2543 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/snake.jpg (renamed from demos/declarative/snake/content/pics/snake.jpg) | bin | 663901 -> 663901 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/star.png (renamed from demos/declarative/snake/content/pics/star.png) | bin | 262 -> 262 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/stoneShadow.png (renamed from demos/declarative/snake/content/pics/stoneShadow.png) | bin | 1699 -> 1699 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/yellowStar.png (renamed from demos/declarative/snake/content/pics/yellowStar.png) | bin | 276 -> 276 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/pics/yellowStone.png (renamed from demos/declarative/snake/content/pics/yellowStone.png) | bin | 2667 -> 2667 bytes | |||
-rw-r--r-- | examples/declarative/snake/content/snake.js (renamed from demos/declarative/snake/content/snake.js) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/snake.qml (renamed from demos/declarative/snake/snake.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/snake.qmlproject (renamed from demos/declarative/snake/snake.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/Button.qml (renamed from demos/declarative/twitter/TwitterCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/FatDelegate.qml (renamed from demos/declarative/twitter/TwitterCore/FatDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/Input.qml (renamed from demos/declarative/twitter/TwitterCore/Input.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/Loading.qml (renamed from demos/declarative/twitter/TwitterCore/Loading.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/MultiTitleBar.qml (renamed from demos/declarative/twitter/TwitterCore/MultiTitleBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/RssModel.qml (renamed from demos/declarative/twitter/TwitterCore/RssModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/SearchView.qml (renamed from demos/declarative/twitter/TwitterCore/SearchView.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/TitleBar.qml (renamed from demos/declarative/twitter/TwitterCore/TitleBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/ToolBar.qml (renamed from demos/declarative/twitter/TwitterCore/ToolBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/UserModel.qml (renamed from demos/declarative/twitter/TwitterCore/UserModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/images/gloss.png (renamed from demos/declarative/twitter/TwitterCore/images/gloss.png) | bin | 1236 -> 1236 bytes | |||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/images/lineedit.png (renamed from demos/declarative/twitter/TwitterCore/images/lineedit.png) | bin | 1415 -> 1415 bytes | |||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/images/lineedit.sci (renamed from demos/declarative/twitter/TwitterCore/images/lineedit.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/images/loading.png (renamed from demos/declarative/twitter/TwitterCore/images/loading.png) | bin | 813 -> 813 bytes | |||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/images/quit.png (renamed from demos/declarative/twitter/TwitterCore/images/quit.png) | bin | 2369 -> 2369 bytes | |||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/images/stripes.png (renamed from demos/declarative/twitter/TwitterCore/images/stripes.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/images/titlebar.png (renamed from demos/declarative/twitter/TwitterCore/images/titlebar.png) | bin | 1436 -> 1436 bytes | |||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/images/titlebar.sci (renamed from demos/declarative/twitter/TwitterCore/images/titlebar.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/images/toolbutton.png (renamed from demos/declarative/twitter/TwitterCore/images/toolbutton.png) | bin | 2550 -> 2550 bytes | |||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/images/toolbutton.sci (renamed from demos/declarative/twitter/TwitterCore/images/toolbutton.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/TwitterCore/qmldir (renamed from demos/declarative/twitter/TwitterCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/twitter.qml (renamed from demos/declarative/twitter/twitter.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/twitter.qmlproject (renamed from demos/declarative/twitter/twitter.qmlproject) | 0 | ||||
-rw-r--r-- | examples/embedded/embedded.pro (renamed from demos/embedded/embedded.pro) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlcalculator/deployment.pri (renamed from demos/embedded/qmlcalculator/deployment.pri) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlcalculator/qmlcalculator.cpp (renamed from demos/embedded/qmlcalculator/qmlcalculator.cpp) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlcalculator/qmlcalculator.pro (renamed from demos/embedded/qmlcalculator/qmlcalculator.pro) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlclocks/deployment.pri (renamed from demos/embedded/qmlclocks/deployment.pri) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlclocks/qmlclocks.cpp (renamed from demos/embedded/qmlclocks/qmlclocks.cpp) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlclocks/qmlclocks.pro (renamed from demos/embedded/qmlclocks/qmlclocks.pro) | 0 | ||||
-rw-r--r-- | examples/embedded/qmldialcontrol/deployment.pri (renamed from demos/embedded/qmldialcontrol/deployment.pri) | 0 | ||||
-rw-r--r-- | examples/embedded/qmldialcontrol/qmldialcontrol.cpp (renamed from demos/embedded/qmldialcontrol/qmldialcontrol.cpp) | 0 | ||||
-rw-r--r-- | examples/embedded/qmldialcontrol/qmldialcontrol.pro (renamed from demos/embedded/qmldialcontrol/qmldialcontrol.pro) | 0 | ||||
-rw-r--r-- | examples/embedded/qmleasing/deployment.pri (renamed from demos/embedded/qmleasing/deployment.pri) | 0 | ||||
-rw-r--r-- | examples/embedded/qmleasing/qmleasing.cpp (renamed from demos/embedded/qmleasing/qmleasing.cpp) | 0 | ||||
-rw-r--r-- | examples/embedded/qmleasing/qmleasing.pro (renamed from demos/embedded/qmleasing/qmleasing.pro) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlflickr/deployment.pri (renamed from demos/embedded/qmlflickr/deployment.pri) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlflickr/qmlflickr.cpp (renamed from demos/embedded/qmlflickr/qmlflickr.cpp) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlflickr/qmlflickr.pro (renamed from demos/embedded/qmlflickr/qmlflickr.pro) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlphotoviewer/deployment.pri (renamed from demos/embedded/qmlphotoviewer/deployment.pri) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp (renamed from demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp) | 0 | ||||
-rw-r--r-- | examples/embedded/qmlphotoviewer/qmlphotoviewer.pro (renamed from demos/embedded/qmlphotoviewer/qmlphotoviewer.pro) | 0 | ||||
-rw-r--r-- | examples/embedded/qmltwitter/deployment.pri (renamed from demos/embedded/qmltwitter/deployment.pri) | 0 | ||||
-rw-r--r-- | examples/embedded/qmltwitter/qmltwitter.cpp (renamed from demos/embedded/qmltwitter/qmltwitter.cpp) | 0 | ||||
-rw-r--r-- | examples/embedded/qmltwitter/qmltwitter.pro (renamed from demos/embedded/qmltwitter/qmltwitter.pro) | 0 | ||||
-rw-r--r-- | qtdeclarative.pro | 8 |
213 files changed, 12 insertions, 48 deletions
diff --git a/demos/declarative/declarative.pro b/demos/declarative/declarative.pro deleted file mode 100644 index 561832c347..0000000000 --- a/demos/declarative/declarative.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = subdirs - -# These demos contain C++ and need to be compiled -SUBDIRS = \ - minehunt - -# These examples contain no C++ and can simply be copied -sources.files = \ - calculator \ - flickr \ - photoviewer \ - samegame \ - snake \ - twitter \ - rssnews \ - webbrowser - -sources.path = $$[QT_INSTALL_DEMOS]/qtdeclarative/declarative -INSTALLS += sources - diff --git a/demos/declarative/demos.qmlproject b/demos/declarative/demos.qmlproject deleted file mode 100644 index d4909f8685..0000000000 --- a/demos/declarative/demos.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - // importPaths: [ " ../exampleplugin " ] -} diff --git a/demos/demos.pro b/demos/demos.pro deleted file mode 100644 index 09881f1a9c..0000000000 --- a/demos/demos.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += declarative diff --git a/demos/declarative/calculator/Core/Button.qml b/examples/declarative/calculator/Core/Button.qml index c5ec39cea8..c5ec39cea8 100644 --- a/demos/declarative/calculator/Core/Button.qml +++ b/examples/declarative/calculator/Core/Button.qml diff --git a/demos/declarative/calculator/Core/Display.qml b/examples/declarative/calculator/Core/Display.qml index 5e27897bae..5e27897bae 100644 --- a/demos/declarative/calculator/Core/Display.qml +++ b/examples/declarative/calculator/Core/Display.qml diff --git a/demos/declarative/calculator/Core/calculator.js b/examples/declarative/calculator/Core/calculator.js index 7c363c7f30..7c363c7f30 100644 --- a/demos/declarative/calculator/Core/calculator.js +++ b/examples/declarative/calculator/Core/calculator.js diff --git a/demos/declarative/calculator/Core/images/button-.png b/examples/declarative/calculator/Core/images/button-.png Binary files differindex 544e514536..544e514536 100644 --- a/demos/declarative/calculator/Core/images/button-.png +++ b/examples/declarative/calculator/Core/images/button-.png diff --git a/demos/declarative/calculator/Core/images/button-blue.png b/examples/declarative/calculator/Core/images/button-blue.png Binary files differindex 5f92de32d0..5f92de32d0 100644 --- a/demos/declarative/calculator/Core/images/button-blue.png +++ b/examples/declarative/calculator/Core/images/button-blue.png diff --git a/demos/declarative/calculator/Core/images/button-green.png b/examples/declarative/calculator/Core/images/button-green.png Binary files differindex 36c93914c7..36c93914c7 100644 --- a/demos/declarative/calculator/Core/images/button-green.png +++ b/examples/declarative/calculator/Core/images/button-green.png diff --git a/demos/declarative/calculator/Core/images/button-purple.png b/examples/declarative/calculator/Core/images/button-purple.png Binary files differindex 347cbbea9d..347cbbea9d 100644 --- a/demos/declarative/calculator/Core/images/button-purple.png +++ b/examples/declarative/calculator/Core/images/button-purple.png diff --git a/demos/declarative/calculator/Core/images/button-red.png b/examples/declarative/calculator/Core/images/button-red.png Binary files differindex 3b335891ae..3b335891ae 100644 --- a/demos/declarative/calculator/Core/images/button-red.png +++ b/examples/declarative/calculator/Core/images/button-red.png diff --git a/demos/declarative/calculator/Core/images/display.png b/examples/declarative/calculator/Core/images/display.png Binary files differindex 9507f4382e..9507f4382e 100644 --- a/demos/declarative/calculator/Core/images/display.png +++ b/examples/declarative/calculator/Core/images/display.png diff --git a/demos/declarative/calculator/Core/qmldir b/examples/declarative/calculator/Core/qmldir index a926b93fac..a926b93fac 100644 --- a/demos/declarative/calculator/Core/qmldir +++ b/examples/declarative/calculator/Core/qmldir diff --git a/demos/declarative/calculator/calculator.qml b/examples/declarative/calculator/calculator.qml index c844c710aa..c844c710aa 100644 --- a/demos/declarative/calculator/calculator.qml +++ b/examples/declarative/calculator/calculator.qml diff --git a/demos/declarative/calculator/calculator.qmlproject b/examples/declarative/calculator/calculator.qmlproject index d4909f8685..d4909f8685 100644 --- a/demos/declarative/calculator/calculator.qmlproject +++ b/examples/declarative/calculator/calculator.qmlproject diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index cbeb7e9e26..c2950616a2 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -3,9 +3,10 @@ TEMPLATE = subdirs # These examples contain some C++ and need to be built SUBDIRS = \ cppextensions \ + minehunt \ modelviews \ - tutorials \ - painteditem + painteditem \ + tutorials # plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name symbian:SUBDIRS -= plugins @@ -13,18 +14,27 @@ symbian:SUBDIRS -= plugins # These examples contain no C++ and can simply be copied sources.files = \ animation \ + calculator \ cppextensions \ + flickr \ i18n \ imageelements \ keyinteraction \ + photoviewer \ positioners \ + rssnews \ + samegame \ + snake \ sqllocalstorage \ text \ threading \ touchinteraction \ toys \ + twitter \ ui-components \ + webbrowser \ xml + sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative INSTALLS += sources diff --git a/demos/declarative/flickr/content/Button.qml b/examples/declarative/flickr/content/Button.qml index 7285753a0a..7285753a0a 100644 --- a/demos/declarative/flickr/content/Button.qml +++ b/examples/declarative/flickr/content/Button.qml diff --git a/demos/declarative/flickr/content/GridDelegate.qml b/examples/declarative/flickr/content/GridDelegate.qml index 5b7af23ea0..5b7af23ea0 100644 --- a/demos/declarative/flickr/content/GridDelegate.qml +++ b/examples/declarative/flickr/content/GridDelegate.qml diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/examples/declarative/flickr/content/ImageDetails.qml index 74346466e3..74346466e3 100644 --- a/demos/declarative/flickr/content/ImageDetails.qml +++ b/examples/declarative/flickr/content/ImageDetails.qml diff --git a/demos/declarative/flickr/content/ListDelegate.qml b/examples/declarative/flickr/content/ListDelegate.qml index b65704867b..b65704867b 100644 --- a/demos/declarative/flickr/content/ListDelegate.qml +++ b/examples/declarative/flickr/content/ListDelegate.qml diff --git a/demos/declarative/flickr/content/Progress.qml b/examples/declarative/flickr/content/Progress.qml index 73a91a4aa9..73a91a4aa9 100644 --- a/demos/declarative/flickr/content/Progress.qml +++ b/examples/declarative/flickr/content/Progress.qml diff --git a/demos/declarative/flickr/content/RssModel.qml b/examples/declarative/flickr/content/RssModel.qml index 007f086830..007f086830 100644 --- a/demos/declarative/flickr/content/RssModel.qml +++ b/examples/declarative/flickr/content/RssModel.qml diff --git a/demos/declarative/flickr/content/ScrollBar.qml b/examples/declarative/flickr/content/ScrollBar.qml index 7d2d9ff7d3..7d2d9ff7d3 100644 --- a/demos/declarative/flickr/content/ScrollBar.qml +++ b/examples/declarative/flickr/content/ScrollBar.qml diff --git a/demos/declarative/flickr/content/Slider.qml b/examples/declarative/flickr/content/Slider.qml index b4a2960ac8..b4a2960ac8 100644 --- a/demos/declarative/flickr/content/Slider.qml +++ b/examples/declarative/flickr/content/Slider.qml diff --git a/demos/declarative/flickr/content/StreamView.qml b/examples/declarative/flickr/content/StreamView.qml index e2c65e22fe..e2c65e22fe 100644 --- a/demos/declarative/flickr/content/StreamView.qml +++ b/examples/declarative/flickr/content/StreamView.qml diff --git a/demos/declarative/flickr/content/TitleBar.qml b/examples/declarative/flickr/content/TitleBar.qml index 381d252ed3..381d252ed3 100644 --- a/demos/declarative/flickr/content/TitleBar.qml +++ b/examples/declarative/flickr/content/TitleBar.qml diff --git a/demos/declarative/flickr/content/ToolBar.qml b/examples/declarative/flickr/content/ToolBar.qml index ca5341e101..ca5341e101 100644 --- a/demos/declarative/flickr/content/ToolBar.qml +++ b/examples/declarative/flickr/content/ToolBar.qml diff --git a/demos/declarative/flickr/content/UnifiedDelegate.qml b/examples/declarative/flickr/content/UnifiedDelegate.qml index f4c926763f..f4c926763f 100644 --- a/demos/declarative/flickr/content/UnifiedDelegate.qml +++ b/examples/declarative/flickr/content/UnifiedDelegate.qml diff --git a/demos/declarative/flickr/content/images/gloss.png b/examples/declarative/flickr/content/images/gloss.png Binary files differindex 5d370cd93d..5d370cd93d 100644 --- a/demos/declarative/flickr/content/images/gloss.png +++ b/examples/declarative/flickr/content/images/gloss.png diff --git a/demos/declarative/flickr/content/images/lineedit.png b/examples/declarative/flickr/content/images/lineedit.png Binary files differindex 2cc38dc35b..2cc38dc35b 100644 --- a/demos/declarative/flickr/content/images/lineedit.png +++ b/examples/declarative/flickr/content/images/lineedit.png diff --git a/demos/declarative/flickr/content/images/lineedit.sci b/examples/declarative/flickr/content/images/lineedit.sci index 054bff78be..054bff78be 100644 --- a/demos/declarative/flickr/content/images/lineedit.sci +++ b/examples/declarative/flickr/content/images/lineedit.sci diff --git a/demos/declarative/flickr/content/images/noise.png b/examples/declarative/flickr/content/images/noise.png Binary files differindex c5a5ba0053..c5a5ba0053 100644 --- a/demos/declarative/flickr/content/images/noise.png +++ b/examples/declarative/flickr/content/images/noise.png diff --git a/demos/declarative/flickr/content/images/particle.png b/examples/declarative/flickr/content/images/particle.png Binary files differindex dbc39cb16e..dbc39cb16e 100644 --- a/demos/declarative/flickr/content/images/particle.png +++ b/examples/declarative/flickr/content/images/particle.png diff --git a/demos/declarative/flickr/content/images/quit.png b/examples/declarative/flickr/content/images/quit.png Binary files differindex 5bda1b6e0d..5bda1b6e0d 100644 --- a/demos/declarative/flickr/content/images/quit.png +++ b/examples/declarative/flickr/content/images/quit.png diff --git a/demos/declarative/flickr/content/images/squareParticle.png b/examples/declarative/flickr/content/images/squareParticle.png Binary files differindex faf85c24e0..faf85c24e0 100644 --- a/demos/declarative/flickr/content/images/squareParticle.png +++ b/examples/declarative/flickr/content/images/squareParticle.png diff --git a/demos/declarative/flickr/content/images/stripes.png b/examples/declarative/flickr/content/images/stripes.png Binary files differindex 9f36727ea4..9f36727ea4 100644 --- a/demos/declarative/flickr/content/images/stripes.png +++ b/examples/declarative/flickr/content/images/stripes.png diff --git a/demos/declarative/flickr/content/images/titlebar.png b/examples/declarative/flickr/content/images/titlebar.png Binary files differindex 51c90082d0..51c90082d0 100644 --- a/demos/declarative/flickr/content/images/titlebar.png +++ b/examples/declarative/flickr/content/images/titlebar.png diff --git a/demos/declarative/flickr/content/images/titlebar.sci b/examples/declarative/flickr/content/images/titlebar.sci index 0418d94cd6..0418d94cd6 100644 --- a/demos/declarative/flickr/content/images/titlebar.sci +++ b/examples/declarative/flickr/content/images/titlebar.sci diff --git a/demos/declarative/flickr/content/images/toolbutton.png b/examples/declarative/flickr/content/images/toolbutton.png Binary files differindex 11310013ee..11310013ee 100644 --- a/demos/declarative/flickr/content/images/toolbutton.png +++ b/examples/declarative/flickr/content/images/toolbutton.png diff --git a/demos/declarative/flickr/content/images/toolbutton.sci b/examples/declarative/flickr/content/images/toolbutton.sci index 9e4f965307..9e4f965307 100644 --- a/demos/declarative/flickr/content/images/toolbutton.sci +++ b/examples/declarative/flickr/content/images/toolbutton.sci diff --git a/demos/declarative/flickr/content/qmldir b/examples/declarative/flickr/content/qmldir index adc2479b9f..adc2479b9f 100644 --- a/demos/declarative/flickr/content/qmldir +++ b/examples/declarative/flickr/content/qmldir diff --git a/demos/declarative/flickr/flickr-90.qml b/examples/declarative/flickr/flickr-90.qml index ce22d8a3a9..ce22d8a3a9 100644 --- a/demos/declarative/flickr/flickr-90.qml +++ b/examples/declarative/flickr/flickr-90.qml diff --git a/demos/declarative/flickr/flickr.qml b/examples/declarative/flickr/flickr.qml index a222b41341..a222b41341 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/examples/declarative/flickr/flickr.qml diff --git a/demos/declarative/flickr/flickr.qmlproject b/examples/declarative/flickr/flickr.qmlproject index d4909f8685..d4909f8685 100644 --- a/demos/declarative/flickr/flickr.qmlproject +++ b/examples/declarative/flickr/flickr.qmlproject diff --git a/demos/declarative/minehunt/MinehuntCore/Explosion.qml b/examples/declarative/minehunt/MinehuntCore/Explosion.qml index a5f3f1bc31..a5f3f1bc31 100644 --- a/demos/declarative/minehunt/MinehuntCore/Explosion.qml +++ b/examples/declarative/minehunt/MinehuntCore/Explosion.qml diff --git a/demos/declarative/minehunt/MinehuntCore/Tile.qml b/examples/declarative/minehunt/MinehuntCore/Tile.qml index 90247f8575..90247f8575 100644 --- a/demos/declarative/minehunt/MinehuntCore/Tile.qml +++ b/examples/declarative/minehunt/MinehuntCore/Tile.qml diff --git a/demos/declarative/minehunt/MinehuntCore/pics/back.png b/examples/declarative/minehunt/MinehuntCore/pics/back.png Binary files differindex f6b3f0b4d7..f6b3f0b4d7 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/back.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/back.png diff --git a/demos/declarative/minehunt/MinehuntCore/pics/background.png b/examples/declarative/minehunt/MinehuntCore/pics/background.png Binary files differindex 3734a27744..3734a27744 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/background.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/background.png diff --git a/demos/declarative/minehunt/MinehuntCore/pics/bomb-color.png b/examples/declarative/minehunt/MinehuntCore/pics/bomb-color.png Binary files differindex 61ad0a928f..61ad0a928f 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/bomb-color.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/bomb-color.png diff --git a/demos/declarative/minehunt/MinehuntCore/pics/bomb.png b/examples/declarative/minehunt/MinehuntCore/pics/bomb.png Binary files differindex a992575518..a992575518 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/bomb.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/bomb.png diff --git a/demos/declarative/minehunt/MinehuntCore/pics/face-sad.png b/examples/declarative/minehunt/MinehuntCore/pics/face-sad.png Binary files differindex cf00aafe1f..cf00aafe1f 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/face-sad.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/face-sad.png diff --git a/demos/declarative/minehunt/MinehuntCore/pics/face-smile-big.png b/examples/declarative/minehunt/MinehuntCore/pics/face-smile-big.png Binary files differindex f9c2335df5..f9c2335df5 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/face-smile-big.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/face-smile-big.png diff --git a/demos/declarative/minehunt/MinehuntCore/pics/face-smile.png b/examples/declarative/minehunt/MinehuntCore/pics/face-smile.png Binary files differindex 3d66d72578..3d66d72578 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/face-smile.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/face-smile.png diff --git a/demos/declarative/minehunt/MinehuntCore/pics/flag-color.png b/examples/declarative/minehunt/MinehuntCore/pics/flag-color.png Binary files differindex aadad0f11a..aadad0f11a 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/flag-color.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/flag-color.png diff --git a/demos/declarative/minehunt/MinehuntCore/pics/flag.png b/examples/declarative/minehunt/MinehuntCore/pics/flag.png Binary files differindex 39cde4df82..39cde4df82 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/flag.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/flag.png diff --git a/demos/declarative/minehunt/MinehuntCore/pics/front.png b/examples/declarative/minehunt/MinehuntCore/pics/front.png Binary files differindex 834331bd49..834331bd49 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/front.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/front.png diff --git a/demos/declarative/minehunt/MinehuntCore/pics/quit.png b/examples/declarative/minehunt/MinehuntCore/pics/quit.png Binary files differindex b822057d4e..b822057d4e 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/quit.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/quit.png diff --git a/demos/declarative/minehunt/MinehuntCore/pics/star.png b/examples/declarative/minehunt/MinehuntCore/pics/star.png Binary files differindex 3772359188..3772359188 100644 --- a/demos/declarative/minehunt/MinehuntCore/pics/star.png +++ b/examples/declarative/minehunt/MinehuntCore/pics/star.png diff --git a/demos/declarative/minehunt/MinehuntCore/qmldir b/examples/declarative/minehunt/MinehuntCore/qmldir index 81980e09a6..81980e09a6 100644 --- a/demos/declarative/minehunt/MinehuntCore/qmldir +++ b/examples/declarative/minehunt/MinehuntCore/qmldir diff --git a/demos/declarative/minehunt/README b/examples/declarative/minehunt/README index 3849ca5fbf..3849ca5fbf 100644 --- a/demos/declarative/minehunt/README +++ b/examples/declarative/minehunt/README diff --git a/demos/declarative/minehunt/main.cpp b/examples/declarative/minehunt/main.cpp index 9e7ab5f120..9e7ab5f120 100644 --- a/demos/declarative/minehunt/main.cpp +++ b/examples/declarative/minehunt/main.cpp diff --git a/demos/declarative/minehunt/minehunt.cpp b/examples/declarative/minehunt/minehunt.cpp index c95f234ab3..c95f234ab3 100644 --- a/demos/declarative/minehunt/minehunt.cpp +++ b/examples/declarative/minehunt/minehunt.cpp diff --git a/demos/declarative/minehunt/minehunt.h b/examples/declarative/minehunt/minehunt.h index d4a318dab9..d4a318dab9 100644 --- a/demos/declarative/minehunt/minehunt.h +++ b/examples/declarative/minehunt/minehunt.h diff --git a/demos/declarative/minehunt/minehunt.pro b/examples/declarative/minehunt/minehunt.pro index a0220f2dc7..a0220f2dc7 100644 --- a/demos/declarative/minehunt/minehunt.pro +++ b/examples/declarative/minehunt/minehunt.pro diff --git a/demos/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml index 2129350625..2129350625 100644 --- a/demos/declarative/minehunt/minehunt.qml +++ b/examples/declarative/minehunt/minehunt.qml diff --git a/demos/declarative/minehunt/minehunt.qmlproject b/examples/declarative/minehunt/minehunt.qmlproject index d4909f8685..d4909f8685 100644 --- a/demos/declarative/minehunt/minehunt.qmlproject +++ b/examples/declarative/minehunt/minehunt.qmlproject diff --git a/demos/declarative/minehunt/minehunt.qrc b/examples/declarative/minehunt/minehunt.qrc index fa8e27d383..fa8e27d383 100644 --- a/demos/declarative/minehunt/minehunt.qrc +++ b/examples/declarative/minehunt/minehunt.qrc diff --git a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml index 61005382da..61005382da 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml +++ b/examples/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml diff --git a/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml index 14eb6439c0..14eb6439c0 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml +++ b/examples/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml diff --git a/demos/declarative/photoviewer/PhotoViewerCore/Button.qml b/examples/declarative/photoviewer/PhotoViewerCore/Button.qml index 481bcc5a55..481bcc5a55 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/Button.qml +++ b/examples/declarative/photoviewer/PhotoViewerCore/Button.qml diff --git a/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/declarative/photoviewer/PhotoViewerCore/EditableButton.qml index 9c47310ebd..9c47310ebd 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml +++ b/examples/declarative/photoviewer/PhotoViewerCore/EditableButton.qml diff --git a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml index 4c1692cb08..4c1692cb08 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml +++ b/examples/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml diff --git a/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml index 805eac208e..805eac208e 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml +++ b/examples/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml diff --git a/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml b/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml index 9f6c004952..9f6c004952 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml +++ b/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml diff --git a/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml b/examples/declarative/photoviewer/PhotoViewerCore/Tag.qml index 486a28d960..486a28d960 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml +++ b/examples/declarative/photoviewer/PhotoViewerCore/Tag.qml diff --git a/demos/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png Binary files differindex 431af8545d..431af8545d 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png +++ b/examples/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png diff --git a/demos/declarative/photoviewer/PhotoViewerCore/images/busy.png b/examples/declarative/photoviewer/PhotoViewerCore/images/busy.png Binary files differindex 664c2b1491..664c2b1491 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/images/busy.png +++ b/examples/declarative/photoviewer/PhotoViewerCore/images/busy.png diff --git a/demos/declarative/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/declarative/photoviewer/PhotoViewerCore/images/cardboard.png Binary files differindex 1847ab528d..1847ab528d 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/images/cardboard.png +++ b/examples/declarative/photoviewer/PhotoViewerCore/images/cardboard.png diff --git a/demos/declarative/photoviewer/PhotoViewerCore/qmldir b/examples/declarative/photoviewer/PhotoViewerCore/qmldir index d3c247f21a..d3c247f21a 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/qmldir +++ b/examples/declarative/photoviewer/PhotoViewerCore/qmldir diff --git a/demos/declarative/photoviewer/PhotoViewerCore/script/script.js b/examples/declarative/photoviewer/PhotoViewerCore/script/script.js index e8ef93a847..e8ef93a847 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/script/script.js +++ b/examples/declarative/photoviewer/PhotoViewerCore/script/script.js diff --git a/demos/declarative/photoviewer/i18n/base.ts b/examples/declarative/photoviewer/i18n/base.ts index 1accfd2f90..1accfd2f90 100644 --- a/demos/declarative/photoviewer/i18n/base.ts +++ b/examples/declarative/photoviewer/i18n/base.ts diff --git a/demos/declarative/photoviewer/i18n/qml_fr.qm b/examples/declarative/photoviewer/i18n/qml_fr.qm Binary files differindex c24fcbc46c..c24fcbc46c 100644 --- a/demos/declarative/photoviewer/i18n/qml_fr.qm +++ b/examples/declarative/photoviewer/i18n/qml_fr.qm diff --git a/demos/declarative/photoviewer/i18n/qml_fr.ts b/examples/declarative/photoviewer/i18n/qml_fr.ts index 9f892db616..9f892db616 100644 --- a/demos/declarative/photoviewer/i18n/qml_fr.ts +++ b/examples/declarative/photoviewer/i18n/qml_fr.ts diff --git a/demos/declarative/photoviewer/photoviewer.qml b/examples/declarative/photoviewer/photoviewer.qml index d2eaa56c1a..d2eaa56c1a 100644 --- a/demos/declarative/photoviewer/photoviewer.qml +++ b/examples/declarative/photoviewer/photoviewer.qml diff --git a/demos/declarative/photoviewer/photoviewer.qmlproject b/examples/declarative/photoviewer/photoviewer.qmlproject index d4909f8685..d4909f8685 100644 --- a/demos/declarative/photoviewer/photoviewer.qmlproject +++ b/examples/declarative/photoviewer/photoviewer.qmlproject diff --git a/demos/declarative/plasmapatrol/PlasmaPatrol.qmlproject b/examples/declarative/plasmapatrol/PlasmaPatrol.qmlproject index 53f5ecb8d2..53f5ecb8d2 100644 --- a/demos/declarative/plasmapatrol/PlasmaPatrol.qmlproject +++ b/examples/declarative/plasmapatrol/PlasmaPatrol.qmlproject diff --git a/demos/declarative/plasmapatrol/TODO b/examples/declarative/plasmapatrol/TODO index ef9d21a73d..ef9d21a73d 100644 --- a/demos/declarative/plasmapatrol/TODO +++ b/examples/declarative/plasmapatrol/TODO diff --git a/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml b/examples/declarative/plasmapatrol/content/BlasterHardpoint.qml index 1242a85149..1242a85149 100644 --- a/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml +++ b/examples/declarative/plasmapatrol/content/BlasterHardpoint.qml diff --git a/demos/declarative/plasmapatrol/content/Button.qml b/examples/declarative/plasmapatrol/content/Button.qml index 0d810e3b75..0d810e3b75 100644 --- a/demos/declarative/plasmapatrol/content/Button.qml +++ b/examples/declarative/plasmapatrol/content/Button.qml diff --git a/demos/declarative/plasmapatrol/content/CannonHardpoint.qml b/examples/declarative/plasmapatrol/content/CannonHardpoint.qml index b7572ef5c4..b7572ef5c4 100644 --- a/demos/declarative/plasmapatrol/content/CannonHardpoint.qml +++ b/examples/declarative/plasmapatrol/content/CannonHardpoint.qml diff --git a/demos/declarative/plasmapatrol/content/ChoiceBox.qml b/examples/declarative/plasmapatrol/content/ChoiceBox.qml index 1e64a76225..1e64a76225 100644 --- a/demos/declarative/plasmapatrol/content/ChoiceBox.qml +++ b/examples/declarative/plasmapatrol/content/ChoiceBox.qml diff --git a/demos/declarative/plasmapatrol/content/Cruiser.qml b/examples/declarative/plasmapatrol/content/Cruiser.qml index a844fa1bb8..a844fa1bb8 100644 --- a/demos/declarative/plasmapatrol/content/Cruiser.qml +++ b/examples/declarative/plasmapatrol/content/Cruiser.qml diff --git a/demos/declarative/plasmapatrol/content/Frigate.qml b/examples/declarative/plasmapatrol/content/Frigate.qml index d31405250e..d31405250e 100644 --- a/demos/declarative/plasmapatrol/content/Frigate.qml +++ b/examples/declarative/plasmapatrol/content/Frigate.qml diff --git a/demos/declarative/plasmapatrol/content/Hardpoint.qml b/examples/declarative/plasmapatrol/content/Hardpoint.qml index 3d4edb38f8..3d4edb38f8 100644 --- a/demos/declarative/plasmapatrol/content/Hardpoint.qml +++ b/examples/declarative/plasmapatrol/content/Hardpoint.qml diff --git a/demos/declarative/plasmapatrol/content/HelpScreens.qml b/examples/declarative/plasmapatrol/content/HelpScreens.qml index 7e4fb9f1c9..7e4fb9f1c9 100644 --- a/demos/declarative/plasmapatrol/content/HelpScreens.qml +++ b/examples/declarative/plasmapatrol/content/HelpScreens.qml diff --git a/demos/declarative/plasmapatrol/content/LaserHardpoint.qml b/examples/declarative/plasmapatrol/content/LaserHardpoint.qml index e99424856c..e99424856c 100644 --- a/demos/declarative/plasmapatrol/content/LaserHardpoint.qml +++ b/examples/declarative/plasmapatrol/content/LaserHardpoint.qml diff --git a/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml b/examples/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml index b65686e59e..b65686e59e 100644 --- a/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml +++ b/examples/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml diff --git a/demos/declarative/plasmapatrol/content/SequentialLoader.qml b/examples/declarative/plasmapatrol/content/SequentialLoader.qml index 85a979b222..85a979b222 100644 --- a/demos/declarative/plasmapatrol/content/SequentialLoader.qml +++ b/examples/declarative/plasmapatrol/content/SequentialLoader.qml diff --git a/demos/declarative/plasmapatrol/content/Ship.qml b/examples/declarative/plasmapatrol/content/Ship.qml index ce8fb6073f..ce8fb6073f 100644 --- a/demos/declarative/plasmapatrol/content/Ship.qml +++ b/examples/declarative/plasmapatrol/content/Ship.qml diff --git a/demos/declarative/plasmapatrol/content/Sloop.qml b/examples/declarative/plasmapatrol/content/Sloop.qml index 1a6f3a9620..1a6f3a9620 100644 --- a/demos/declarative/plasmapatrol/content/Sloop.qml +++ b/examples/declarative/plasmapatrol/content/Sloop.qml diff --git a/demos/declarative/plasmapatrol/content/pics/TitleText.png b/examples/declarative/plasmapatrol/content/pics/TitleText.png Binary files differindex dc3acebe39..dc3acebe39 100644 --- a/demos/declarative/plasmapatrol/content/pics/TitleText.png +++ b/examples/declarative/plasmapatrol/content/pics/TitleText.png diff --git a/demos/declarative/plasmapatrol/content/pics/blur-circle2.png b/examples/declarative/plasmapatrol/content/pics/blur-circle2.png Binary files differindex f7c9f3e98e..f7c9f3e98e 100644 --- a/demos/declarative/plasmapatrol/content/pics/blur-circle2.png +++ b/examples/declarative/plasmapatrol/content/pics/blur-circle2.png diff --git a/demos/declarative/plasmapatrol/content/pics/blur-circle3.png b/examples/declarative/plasmapatrol/content/pics/blur-circle3.png Binary files differindex dbc39cb16e..dbc39cb16e 100644 --- a/demos/declarative/plasmapatrol/content/pics/blur-circle3.png +++ b/examples/declarative/plasmapatrol/content/pics/blur-circle3.png diff --git a/demos/declarative/plasmapatrol/content/pics/finalfrontier.png b/examples/declarative/plasmapatrol/content/pics/finalfrontier.png Binary files differindex 2ba1815230..2ba1815230 100644 --- a/demos/declarative/plasmapatrol/content/pics/finalfrontier.png +++ b/examples/declarative/plasmapatrol/content/pics/finalfrontier.png diff --git a/demos/declarative/plasmapatrol/content/pics/meteor.png b/examples/declarative/plasmapatrol/content/pics/meteor.png Binary files differindex e8c368aea7..e8c368aea7 100644 --- a/demos/declarative/plasmapatrol/content/pics/meteor.png +++ b/examples/declarative/plasmapatrol/content/pics/meteor.png diff --git a/demos/declarative/plasmapatrol/content/pics/meteor_explo.png b/examples/declarative/plasmapatrol/content/pics/meteor_explo.png Binary files differindex 4297245d49..4297245d49 100644 --- a/demos/declarative/plasmapatrol/content/pics/meteor_explo.png +++ b/examples/declarative/plasmapatrol/content/pics/meteor_explo.png diff --git a/demos/declarative/plasmapatrol/content/pics/nullRock.png b/examples/declarative/plasmapatrol/content/pics/nullRock.png Binary files differindex 4076327a1a..4076327a1a 100644 --- a/demos/declarative/plasmapatrol/content/pics/nullRock.png +++ b/examples/declarative/plasmapatrol/content/pics/nullRock.png diff --git a/demos/declarative/plasmapatrol/content/pics/particle.png b/examples/declarative/plasmapatrol/content/pics/particle.png Binary files differindex 5c83896d22..5c83896d22 100644 --- a/demos/declarative/plasmapatrol/content/pics/particle.png +++ b/examples/declarative/plasmapatrol/content/pics/particle.png diff --git a/demos/declarative/plasmapatrol/content/pics/star.png b/examples/declarative/plasmapatrol/content/pics/star.png Binary files differindex 0d592cfa87..0d592cfa87 100644 --- a/demos/declarative/plasmapatrol/content/pics/star.png +++ b/examples/declarative/plasmapatrol/content/pics/star.png diff --git a/demos/declarative/plasmapatrol/content/pics/star2.png b/examples/declarative/plasmapatrol/content/pics/star2.png Binary files differindex bb55c44788..bb55c44788 100644 --- a/demos/declarative/plasmapatrol/content/pics/star2.png +++ b/examples/declarative/plasmapatrol/content/pics/star2.png diff --git a/demos/declarative/plasmapatrol/content/pics/star3.png b/examples/declarative/plasmapatrol/content/pics/star3.png Binary files differindex 636a25f480..636a25f480 100644 --- a/demos/declarative/plasmapatrol/content/pics/star3.png +++ b/examples/declarative/plasmapatrol/content/pics/star3.png diff --git a/demos/declarative/plasmapatrol/plasmapatrol.qml b/examples/declarative/plasmapatrol/plasmapatrol.qml index dfc36ded01..dfc36ded01 100644 --- a/demos/declarative/plasmapatrol/plasmapatrol.qml +++ b/examples/declarative/plasmapatrol/plasmapatrol.qml diff --git a/demos/declarative/rssnews/content/BusyIndicator.qml b/examples/declarative/rssnews/content/BusyIndicator.qml index 3ee30d962b..3ee30d962b 100644 --- a/demos/declarative/rssnews/content/BusyIndicator.qml +++ b/examples/declarative/rssnews/content/BusyIndicator.qml diff --git a/demos/declarative/rssnews/content/CategoryDelegate.qml b/examples/declarative/rssnews/content/CategoryDelegate.qml index 0ae9fbec13..0ae9fbec13 100644 --- a/demos/declarative/rssnews/content/CategoryDelegate.qml +++ b/examples/declarative/rssnews/content/CategoryDelegate.qml diff --git a/demos/declarative/rssnews/content/NewsDelegate.qml b/examples/declarative/rssnews/content/NewsDelegate.qml index 061abb24fa..061abb24fa 100644 --- a/demos/declarative/rssnews/content/NewsDelegate.qml +++ b/examples/declarative/rssnews/content/NewsDelegate.qml diff --git a/demos/declarative/rssnews/content/RssFeeds.qml b/examples/declarative/rssnews/content/RssFeeds.qml index 09b1ad808c..09b1ad808c 100644 --- a/demos/declarative/rssnews/content/RssFeeds.qml +++ b/examples/declarative/rssnews/content/RssFeeds.qml diff --git a/demos/declarative/rssnews/content/ScrollBar.qml b/examples/declarative/rssnews/content/ScrollBar.qml index e54be7b6a8..e54be7b6a8 100644 --- a/demos/declarative/rssnews/content/ScrollBar.qml +++ b/examples/declarative/rssnews/content/ScrollBar.qml diff --git a/demos/declarative/rssnews/content/images/busy.png b/examples/declarative/rssnews/content/images/busy.png Binary files differindex 664c2b1491..664c2b1491 100644 --- a/demos/declarative/rssnews/content/images/busy.png +++ b/examples/declarative/rssnews/content/images/busy.png diff --git a/demos/declarative/rssnews/content/images/scrollbar.png b/examples/declarative/rssnews/content/images/scrollbar.png Binary files differindex 0228dcf9eb..0228dcf9eb 100644 --- a/demos/declarative/rssnews/content/images/scrollbar.png +++ b/examples/declarative/rssnews/content/images/scrollbar.png diff --git a/demos/declarative/rssnews/rssnews.qml b/examples/declarative/rssnews/rssnews.qml index b2057a9ed3..b2057a9ed3 100644 --- a/demos/declarative/rssnews/rssnews.qml +++ b/examples/declarative/rssnews/rssnews.qml diff --git a/demos/declarative/rssnews/rssnews.qmlproject b/examples/declarative/rssnews/rssnews.qmlproject index d4909f8685..d4909f8685 100644 --- a/demos/declarative/rssnews/rssnews.qmlproject +++ b/examples/declarative/rssnews/rssnews.qmlproject diff --git a/demos/declarative/samegame/SamegameCore/BoomBlock.qml b/examples/declarative/samegame/SamegameCore/BoomBlock.qml index 2d8fdba2c9..2d8fdba2c9 100644 --- a/demos/declarative/samegame/SamegameCore/BoomBlock.qml +++ b/examples/declarative/samegame/SamegameCore/BoomBlock.qml diff --git a/demos/declarative/samegame/SamegameCore/Button.qml b/examples/declarative/samegame/SamegameCore/Button.qml index be9ad62dfd..be9ad62dfd 100644 --- a/demos/declarative/samegame/SamegameCore/Button.qml +++ b/examples/declarative/samegame/SamegameCore/Button.qml diff --git a/demos/declarative/samegame/SamegameCore/Dialog.qml b/examples/declarative/samegame/SamegameCore/Dialog.qml index aea6ac7dda..aea6ac7dda 100644 --- a/demos/declarative/samegame/SamegameCore/Dialog.qml +++ b/examples/declarative/samegame/SamegameCore/Dialog.qml diff --git a/demos/declarative/samegame/SamegameCore/pics/background.png b/examples/declarative/samegame/SamegameCore/pics/background.png Binary files differindex 3734a27744..3734a27744 100644 --- a/demos/declarative/samegame/SamegameCore/pics/background.png +++ b/examples/declarative/samegame/SamegameCore/pics/background.png diff --git a/demos/declarative/samegame/SamegameCore/pics/blueStone.png b/examples/declarative/samegame/SamegameCore/pics/blueStone.png Binary files differindex 20e43c75b6..20e43c75b6 100644 --- a/demos/declarative/samegame/SamegameCore/pics/blueStone.png +++ b/examples/declarative/samegame/SamegameCore/pics/blueStone.png diff --git a/demos/declarative/samegame/SamegameCore/pics/greenStone.png b/examples/declarative/samegame/SamegameCore/pics/greenStone.png Binary files differindex b568a1900c..b568a1900c 100644 --- a/demos/declarative/samegame/SamegameCore/pics/greenStone.png +++ b/examples/declarative/samegame/SamegameCore/pics/greenStone.png diff --git a/demos/declarative/samegame/SamegameCore/pics/particle.png b/examples/declarative/samegame/SamegameCore/pics/particle.png Binary files differindex 5c83896d22..5c83896d22 100644 --- a/demos/declarative/samegame/SamegameCore/pics/particle.png +++ b/examples/declarative/samegame/SamegameCore/pics/particle.png diff --git a/demos/declarative/samegame/SamegameCore/pics/redStone.png b/examples/declarative/samegame/SamegameCore/pics/redStone.png Binary files differindex 36b09a2686..36b09a2686 100644 --- a/demos/declarative/samegame/SamegameCore/pics/redStone.png +++ b/examples/declarative/samegame/SamegameCore/pics/redStone.png diff --git a/demos/declarative/samegame/SamegameCore/pics/yellowStone.png b/examples/declarative/samegame/SamegameCore/pics/yellowStone.png Binary files differindex b1ce76212c..b1ce76212c 100644 --- a/demos/declarative/samegame/SamegameCore/pics/yellowStone.png +++ b/examples/declarative/samegame/SamegameCore/pics/yellowStone.png diff --git a/demos/declarative/samegame/SamegameCore/qmldir b/examples/declarative/samegame/SamegameCore/qmldir index e17b1f5d2b..e17b1f5d2b 100644 --- a/demos/declarative/samegame/SamegameCore/qmldir +++ b/examples/declarative/samegame/SamegameCore/qmldir diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/examples/declarative/samegame/SamegameCore/samegame.js index 4c5cbe5bb3..4c5cbe5bb3 100755 --- a/demos/declarative/samegame/SamegameCore/samegame.js +++ b/examples/declarative/samegame/SamegameCore/samegame.js diff --git a/demos/declarative/samegame/highscores/README b/examples/declarative/samegame/highscores/README index eaa00fae37..eaa00fae37 100644 --- a/demos/declarative/samegame/highscores/README +++ b/examples/declarative/samegame/highscores/README diff --git a/demos/declarative/samegame/highscores/score_data.xml b/examples/declarative/samegame/highscores/score_data.xml index c3fd90d9cf..c3fd90d9cf 100755 --- a/demos/declarative/samegame/highscores/score_data.xml +++ b/examples/declarative/samegame/highscores/score_data.xml diff --git a/demos/declarative/samegame/highscores/score_style.xsl b/examples/declarative/samegame/highscores/score_style.xsl index 670354c965..670354c965 100755 --- a/demos/declarative/samegame/highscores/score_style.xsl +++ b/examples/declarative/samegame/highscores/score_style.xsl diff --git a/demos/declarative/samegame/highscores/scores.php b/examples/declarative/samegame/highscores/scores.php index 3cceb2d738..3cceb2d738 100755 --- a/demos/declarative/samegame/highscores/scores.php +++ b/examples/declarative/samegame/highscores/scores.php diff --git a/demos/declarative/samegame/samegame.qml b/examples/declarative/samegame/samegame.qml index 0daf72de58..0daf72de58 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/examples/declarative/samegame/samegame.qml diff --git a/demos/declarative/samegame/samegame.qmlproject b/examples/declarative/samegame/samegame.qmlproject index d4909f8685..d4909f8685 100644 --- a/demos/declarative/samegame/samegame.qmlproject +++ b/examples/declarative/samegame/samegame.qmlproject diff --git a/demos/declarative/shadereffects/Slider.qml b/examples/declarative/shadereffects/Slider.qml index e31335d984..e31335d984 100644 --- a/demos/declarative/shadereffects/Slider.qml +++ b/examples/declarative/shadereffects/Slider.qml diff --git a/demos/declarative/shadereffects/face-smile.png b/examples/declarative/shadereffects/face-smile.png Binary files differindex 3d66d72578..3d66d72578 100644 --- a/demos/declarative/shadereffects/face-smile.png +++ b/examples/declarative/shadereffects/face-smile.png diff --git a/demos/declarative/shadereffects/qt-logo.png b/examples/declarative/shadereffects/qt-logo.png Binary files differindex 7d3e97eb36..7d3e97eb36 100644 --- a/demos/declarative/shadereffects/qt-logo.png +++ b/examples/declarative/shadereffects/qt-logo.png diff --git a/demos/declarative/shadereffects/shader-demo.qml b/examples/declarative/shadereffects/shader-demo.qml index 1226064a5d..1226064a5d 100644 --- a/demos/declarative/shadereffects/shader-demo.qml +++ b/examples/declarative/shadereffects/shader-demo.qml diff --git a/demos/declarative/snake/content/Button.qml b/examples/declarative/snake/content/Button.qml index d8a3363d6d..d8a3363d6d 100644 --- a/demos/declarative/snake/content/Button.qml +++ b/examples/declarative/snake/content/Button.qml diff --git a/demos/declarative/snake/content/Cookie.qml b/examples/declarative/snake/content/Cookie.qml index 29b56f9e88..29b56f9e88 100644 --- a/demos/declarative/snake/content/Cookie.qml +++ b/examples/declarative/snake/content/Cookie.qml diff --git a/demos/declarative/snake/content/HighScoreModel.qml b/examples/declarative/snake/content/HighScoreModel.qml index 91b2185ffc..91b2185ffc 100644 --- a/demos/declarative/snake/content/HighScoreModel.qml +++ b/examples/declarative/snake/content/HighScoreModel.qml diff --git a/demos/declarative/snake/content/Link.qml b/examples/declarative/snake/content/Link.qml index ff67ad749e..ff67ad749e 100644 --- a/demos/declarative/snake/content/Link.qml +++ b/examples/declarative/snake/content/Link.qml diff --git a/demos/declarative/snake/content/Skull.qml b/examples/declarative/snake/content/Skull.qml index 4f48145f84..4f48145f84 100644 --- a/demos/declarative/snake/content/Skull.qml +++ b/examples/declarative/snake/content/Skull.qml diff --git a/demos/declarative/snake/content/pics/README b/examples/declarative/snake/content/pics/README index 0215132caa..0215132caa 100644 --- a/demos/declarative/snake/content/pics/README +++ b/examples/declarative/snake/content/pics/README diff --git a/demos/declarative/snake/content/pics/background.png b/examples/declarative/snake/content/pics/background.png Binary files differindex 72dffaa843..72dffaa843 100644 --- a/demos/declarative/snake/content/pics/background.png +++ b/examples/declarative/snake/content/pics/background.png diff --git a/demos/declarative/snake/content/pics/blueStar.png b/examples/declarative/snake/content/pics/blueStar.png Binary files differindex ba7acabd26..ba7acabd26 100644 --- a/demos/declarative/snake/content/pics/blueStar.png +++ b/examples/declarative/snake/content/pics/blueStar.png diff --git a/demos/declarative/snake/content/pics/blueStone.png b/examples/declarative/snake/content/pics/blueStone.png Binary files differindex 356affdd95..356affdd95 100644 --- a/demos/declarative/snake/content/pics/blueStone.png +++ b/examples/declarative/snake/content/pics/blueStone.png diff --git a/demos/declarative/snake/content/pics/cookie.png b/examples/declarative/snake/content/pics/cookie.png Binary files differindex aec2957f34..aec2957f34 100644 --- a/demos/declarative/snake/content/pics/cookie.png +++ b/examples/declarative/snake/content/pics/cookie.png diff --git a/demos/declarative/snake/content/pics/eyes.svg b/examples/declarative/snake/content/pics/eyes.svg index 1078692725..1078692725 100644 --- a/demos/declarative/snake/content/pics/eyes.svg +++ b/examples/declarative/snake/content/pics/eyes.svg diff --git a/demos/declarative/snake/content/pics/head.png b/examples/declarative/snake/content/pics/head.png Binary files differindex 550e002687..550e002687 100644 --- a/demos/declarative/snake/content/pics/head.png +++ b/examples/declarative/snake/content/pics/head.png diff --git a/demos/declarative/snake/content/pics/head.svg b/examples/declarative/snake/content/pics/head.svg index 3bf0bd2feb..3bf0bd2feb 100644 --- a/demos/declarative/snake/content/pics/head.svg +++ b/examples/declarative/snake/content/pics/head.svg diff --git a/demos/declarative/snake/content/pics/pause.png b/examples/declarative/snake/content/pics/pause.png Binary files differindex 056d97dd17..056d97dd17 100644 --- a/demos/declarative/snake/content/pics/pause.png +++ b/examples/declarative/snake/content/pics/pause.png diff --git a/demos/declarative/snake/content/pics/redStar.png b/examples/declarative/snake/content/pics/redStar.png Binary files differindex cd06854719..cd06854719 100644 --- a/demos/declarative/snake/content/pics/redStar.png +++ b/examples/declarative/snake/content/pics/redStar.png diff --git a/demos/declarative/snake/content/pics/redStone.png b/examples/declarative/snake/content/pics/redStone.png Binary files differindex 9bb7fe4277..9bb7fe4277 100644 --- a/demos/declarative/snake/content/pics/redStone.png +++ b/examples/declarative/snake/content/pics/redStone.png diff --git a/demos/declarative/snake/content/pics/skull.png b/examples/declarative/snake/content/pics/skull.png Binary files differindex 63186167bd..63186167bd 100644 --- a/demos/declarative/snake/content/pics/skull.png +++ b/examples/declarative/snake/content/pics/skull.png diff --git a/demos/declarative/snake/content/pics/snake.jpg b/examples/declarative/snake/content/pics/snake.jpg Binary files differindex e91a784f71..e91a784f71 100644 --- a/demos/declarative/snake/content/pics/snake.jpg +++ b/examples/declarative/snake/content/pics/snake.jpg diff --git a/demos/declarative/snake/content/pics/star.png b/examples/declarative/snake/content/pics/star.png Binary files differindex defbde53ca..defbde53ca 100644 --- a/demos/declarative/snake/content/pics/star.png +++ b/examples/declarative/snake/content/pics/star.png diff --git a/demos/declarative/snake/content/pics/stoneShadow.png b/examples/declarative/snake/content/pics/stoneShadow.png Binary files differindex 1bd56afd04..1bd56afd04 100644 --- a/demos/declarative/snake/content/pics/stoneShadow.png +++ b/examples/declarative/snake/content/pics/stoneShadow.png diff --git a/demos/declarative/snake/content/pics/yellowStar.png b/examples/declarative/snake/content/pics/yellowStar.png Binary files differindex 52fb9c4b78..52fb9c4b78 100644 --- a/demos/declarative/snake/content/pics/yellowStar.png +++ b/examples/declarative/snake/content/pics/yellowStar.png diff --git a/demos/declarative/snake/content/pics/yellowStone.png b/examples/declarative/snake/content/pics/yellowStone.png Binary files differindex c56124a895..c56124a895 100644 --- a/demos/declarative/snake/content/pics/yellowStone.png +++ b/examples/declarative/snake/content/pics/yellowStone.png diff --git a/demos/declarative/snake/content/snake.js b/examples/declarative/snake/content/snake.js index 837b82addd..837b82addd 100644 --- a/demos/declarative/snake/content/snake.js +++ b/examples/declarative/snake/content/snake.js diff --git a/demos/declarative/snake/snake.qml b/examples/declarative/snake/snake.qml index edccd4c9df..edccd4c9df 100644 --- a/demos/declarative/snake/snake.qml +++ b/examples/declarative/snake/snake.qml diff --git a/demos/declarative/snake/snake.qmlproject b/examples/declarative/snake/snake.qmlproject index d4909f8685..d4909f8685 100644 --- a/demos/declarative/snake/snake.qmlproject +++ b/examples/declarative/snake/snake.qmlproject diff --git a/demos/declarative/twitter/TwitterCore/Button.qml b/examples/declarative/twitter/TwitterCore/Button.qml index 34ca181527..34ca181527 100644 --- a/demos/declarative/twitter/TwitterCore/Button.qml +++ b/examples/declarative/twitter/TwitterCore/Button.qml diff --git a/demos/declarative/twitter/TwitterCore/FatDelegate.qml b/examples/declarative/twitter/TwitterCore/FatDelegate.qml index 1fe289159c..1fe289159c 100644 --- a/demos/declarative/twitter/TwitterCore/FatDelegate.qml +++ b/examples/declarative/twitter/TwitterCore/FatDelegate.qml diff --git a/demos/declarative/twitter/TwitterCore/Input.qml b/examples/declarative/twitter/TwitterCore/Input.qml index 96fafb6bd2..96fafb6bd2 100644 --- a/demos/declarative/twitter/TwitterCore/Input.qml +++ b/examples/declarative/twitter/TwitterCore/Input.qml diff --git a/demos/declarative/twitter/TwitterCore/Loading.qml b/examples/declarative/twitter/TwitterCore/Loading.qml index e0c4fa03eb..e0c4fa03eb 100644 --- a/demos/declarative/twitter/TwitterCore/Loading.qml +++ b/examples/declarative/twitter/TwitterCore/Loading.qml diff --git a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml b/examples/declarative/twitter/TwitterCore/MultiTitleBar.qml index 6933d485c0..6933d485c0 100644 --- a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml +++ b/examples/declarative/twitter/TwitterCore/MultiTitleBar.qml diff --git a/demos/declarative/twitter/TwitterCore/RssModel.qml b/examples/declarative/twitter/TwitterCore/RssModel.qml index 696ae9d24d..696ae9d24d 100644 --- a/demos/declarative/twitter/TwitterCore/RssModel.qml +++ b/examples/declarative/twitter/TwitterCore/RssModel.qml diff --git a/demos/declarative/twitter/TwitterCore/SearchView.qml b/examples/declarative/twitter/TwitterCore/SearchView.qml index 6e099ae1c7..6e099ae1c7 100644 --- a/demos/declarative/twitter/TwitterCore/SearchView.qml +++ b/examples/declarative/twitter/TwitterCore/SearchView.qml diff --git a/demos/declarative/twitter/TwitterCore/TitleBar.qml b/examples/declarative/twitter/TwitterCore/TitleBar.qml index 1a2f5d5855..1a2f5d5855 100644 --- a/demos/declarative/twitter/TwitterCore/TitleBar.qml +++ b/examples/declarative/twitter/TwitterCore/TitleBar.qml diff --git a/demos/declarative/twitter/TwitterCore/ToolBar.qml b/examples/declarative/twitter/TwitterCore/ToolBar.qml index b277517332..b277517332 100644 --- a/demos/declarative/twitter/TwitterCore/ToolBar.qml +++ b/examples/declarative/twitter/TwitterCore/ToolBar.qml diff --git a/demos/declarative/twitter/TwitterCore/UserModel.qml b/examples/declarative/twitter/TwitterCore/UserModel.qml index b87a083eae..b87a083eae 100644 --- a/demos/declarative/twitter/TwitterCore/UserModel.qml +++ b/examples/declarative/twitter/TwitterCore/UserModel.qml diff --git a/demos/declarative/twitter/TwitterCore/images/gloss.png b/examples/declarative/twitter/TwitterCore/images/gloss.png Binary files differindex 5d370cd93d..5d370cd93d 100644 --- a/demos/declarative/twitter/TwitterCore/images/gloss.png +++ b/examples/declarative/twitter/TwitterCore/images/gloss.png diff --git a/demos/declarative/twitter/TwitterCore/images/lineedit.png b/examples/declarative/twitter/TwitterCore/images/lineedit.png Binary files differindex 2cc38dc35b..2cc38dc35b 100644 --- a/demos/declarative/twitter/TwitterCore/images/lineedit.png +++ b/examples/declarative/twitter/TwitterCore/images/lineedit.png diff --git a/demos/declarative/twitter/TwitterCore/images/lineedit.sci b/examples/declarative/twitter/TwitterCore/images/lineedit.sci index 054bff78be..054bff78be 100644 --- a/demos/declarative/twitter/TwitterCore/images/lineedit.sci +++ b/examples/declarative/twitter/TwitterCore/images/lineedit.sci diff --git a/demos/declarative/twitter/TwitterCore/images/loading.png b/examples/declarative/twitter/TwitterCore/images/loading.png Binary files differindex 47a1589c5d..47a1589c5d 100644 --- a/demos/declarative/twitter/TwitterCore/images/loading.png +++ b/examples/declarative/twitter/TwitterCore/images/loading.png diff --git a/demos/declarative/twitter/TwitterCore/images/quit.png b/examples/declarative/twitter/TwitterCore/images/quit.png Binary files differindex 5bda1b6e0d..5bda1b6e0d 100644 --- a/demos/declarative/twitter/TwitterCore/images/quit.png +++ b/examples/declarative/twitter/TwitterCore/images/quit.png diff --git a/demos/declarative/twitter/TwitterCore/images/stripes.png b/examples/declarative/twitter/TwitterCore/images/stripes.png Binary files differindex 9f36727ea4..9f36727ea4 100644 --- a/demos/declarative/twitter/TwitterCore/images/stripes.png +++ b/examples/declarative/twitter/TwitterCore/images/stripes.png diff --git a/demos/declarative/twitter/TwitterCore/images/titlebar.png b/examples/declarative/twitter/TwitterCore/images/titlebar.png Binary files differindex 51c90082d0..51c90082d0 100644 --- a/demos/declarative/twitter/TwitterCore/images/titlebar.png +++ b/examples/declarative/twitter/TwitterCore/images/titlebar.png diff --git a/demos/declarative/twitter/TwitterCore/images/titlebar.sci b/examples/declarative/twitter/TwitterCore/images/titlebar.sci index 0418d94cd6..0418d94cd6 100644 --- a/demos/declarative/twitter/TwitterCore/images/titlebar.sci +++ b/examples/declarative/twitter/TwitterCore/images/titlebar.sci diff --git a/demos/declarative/twitter/TwitterCore/images/toolbutton.png b/examples/declarative/twitter/TwitterCore/images/toolbutton.png Binary files differindex 11310013ee..11310013ee 100644 --- a/demos/declarative/twitter/TwitterCore/images/toolbutton.png +++ b/examples/declarative/twitter/TwitterCore/images/toolbutton.png diff --git a/demos/declarative/twitter/TwitterCore/images/toolbutton.sci b/examples/declarative/twitter/TwitterCore/images/toolbutton.sci index 9e4f965307..9e4f965307 100644 --- a/demos/declarative/twitter/TwitterCore/images/toolbutton.sci +++ b/examples/declarative/twitter/TwitterCore/images/toolbutton.sci diff --git a/demos/declarative/twitter/TwitterCore/qmldir b/examples/declarative/twitter/TwitterCore/qmldir index 84d85c2885..84d85c2885 100644 --- a/demos/declarative/twitter/TwitterCore/qmldir +++ b/examples/declarative/twitter/TwitterCore/qmldir diff --git a/demos/declarative/twitter/twitter.qml b/examples/declarative/twitter/twitter.qml index 1700b5dcd1..1700b5dcd1 100644 --- a/demos/declarative/twitter/twitter.qml +++ b/examples/declarative/twitter/twitter.qml diff --git a/demos/declarative/twitter/twitter.qmlproject b/examples/declarative/twitter/twitter.qmlproject index d4909f8685..d4909f8685 100644 --- a/demos/declarative/twitter/twitter.qmlproject +++ b/examples/declarative/twitter/twitter.qmlproject diff --git a/demos/embedded/embedded.pro b/examples/embedded/embedded.pro index 81334fa552..81334fa552 100644 --- a/demos/embedded/embedded.pro +++ b/examples/embedded/embedded.pro diff --git a/demos/embedded/qmlcalculator/deployment.pri b/examples/embedded/qmlcalculator/deployment.pri index a97498e91f..a97498e91f 100644 --- a/demos/embedded/qmlcalculator/deployment.pri +++ b/examples/embedded/qmlcalculator/deployment.pri diff --git a/demos/embedded/qmlcalculator/qmlcalculator.cpp b/examples/embedded/qmlcalculator/qmlcalculator.cpp index bed579726c..bed579726c 100644 --- a/demos/embedded/qmlcalculator/qmlcalculator.cpp +++ b/examples/embedded/qmlcalculator/qmlcalculator.cpp diff --git a/demos/embedded/qmlcalculator/qmlcalculator.pro b/examples/embedded/qmlcalculator/qmlcalculator.pro index 4a82d32227..4a82d32227 100644 --- a/demos/embedded/qmlcalculator/qmlcalculator.pro +++ b/examples/embedded/qmlcalculator/qmlcalculator.pro diff --git a/demos/embedded/qmlclocks/deployment.pri b/examples/embedded/qmlclocks/deployment.pri index 6c6704ccc7..6c6704ccc7 100644 --- a/demos/embedded/qmlclocks/deployment.pri +++ b/examples/embedded/qmlclocks/deployment.pri diff --git a/demos/embedded/qmlclocks/qmlclocks.cpp b/examples/embedded/qmlclocks/qmlclocks.cpp index 75d0be0874..75d0be0874 100644 --- a/demos/embedded/qmlclocks/qmlclocks.cpp +++ b/examples/embedded/qmlclocks/qmlclocks.cpp diff --git a/demos/embedded/qmlclocks/qmlclocks.pro b/examples/embedded/qmlclocks/qmlclocks.pro index cc97a7394b..cc97a7394b 100644 --- a/demos/embedded/qmlclocks/qmlclocks.pro +++ b/examples/embedded/qmlclocks/qmlclocks.pro diff --git a/demos/embedded/qmldialcontrol/deployment.pri b/examples/embedded/qmldialcontrol/deployment.pri index a9784439a4..a9784439a4 100644 --- a/demos/embedded/qmldialcontrol/deployment.pri +++ b/examples/embedded/qmldialcontrol/deployment.pri diff --git a/demos/embedded/qmldialcontrol/qmldialcontrol.cpp b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp index 7cc4ed6668..7cc4ed6668 100644 --- a/demos/embedded/qmldialcontrol/qmldialcontrol.cpp +++ b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp diff --git a/demos/embedded/qmldialcontrol/qmldialcontrol.pro b/examples/embedded/qmldialcontrol/qmldialcontrol.pro index 348c41a85d..348c41a85d 100644 --- a/demos/embedded/qmldialcontrol/qmldialcontrol.pro +++ b/examples/embedded/qmldialcontrol/qmldialcontrol.pro diff --git a/demos/embedded/qmleasing/deployment.pri b/examples/embedded/qmleasing/deployment.pri index 946fcd9d89..946fcd9d89 100644 --- a/demos/embedded/qmleasing/deployment.pri +++ b/examples/embedded/qmleasing/deployment.pri diff --git a/demos/embedded/qmleasing/qmleasing.cpp b/examples/embedded/qmleasing/qmleasing.cpp index 38c457d376..38c457d376 100644 --- a/demos/embedded/qmleasing/qmleasing.cpp +++ b/examples/embedded/qmleasing/qmleasing.cpp diff --git a/demos/embedded/qmleasing/qmleasing.pro b/examples/embedded/qmleasing/qmleasing.pro index 9d7c8d7d00..9d7c8d7d00 100644 --- a/demos/embedded/qmleasing/qmleasing.pro +++ b/examples/embedded/qmleasing/qmleasing.pro diff --git a/demos/embedded/qmlflickr/deployment.pri b/examples/embedded/qmlflickr/deployment.pri index a38dc95f8c..a38dc95f8c 100644 --- a/demos/embedded/qmlflickr/deployment.pri +++ b/examples/embedded/qmlflickr/deployment.pri diff --git a/demos/embedded/qmlflickr/qmlflickr.cpp b/examples/embedded/qmlflickr/qmlflickr.cpp index 052d11c48a..052d11c48a 100644 --- a/demos/embedded/qmlflickr/qmlflickr.cpp +++ b/examples/embedded/qmlflickr/qmlflickr.cpp diff --git a/demos/embedded/qmlflickr/qmlflickr.pro b/examples/embedded/qmlflickr/qmlflickr.pro index a70a6df894..a70a6df894 100644 --- a/demos/embedded/qmlflickr/qmlflickr.pro +++ b/examples/embedded/qmlflickr/qmlflickr.pro diff --git a/demos/embedded/qmlphotoviewer/deployment.pri b/examples/embedded/qmlphotoviewer/deployment.pri index 23882e3686..23882e3686 100644 --- a/demos/embedded/qmlphotoviewer/deployment.pri +++ b/examples/embedded/qmlphotoviewer/deployment.pri diff --git a/demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp index 89a0902373..89a0902373 100644 --- a/demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp +++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp diff --git a/demos/embedded/qmlphotoviewer/qmlphotoviewer.pro b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro index ce6ff552cb..ce6ff552cb 100644 --- a/demos/embedded/qmlphotoviewer/qmlphotoviewer.pro +++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro diff --git a/demos/embedded/qmltwitter/deployment.pri b/examples/embedded/qmltwitter/deployment.pri index 3edc0e527c..3edc0e527c 100644 --- a/demos/embedded/qmltwitter/deployment.pri +++ b/examples/embedded/qmltwitter/deployment.pri diff --git a/demos/embedded/qmltwitter/qmltwitter.cpp b/examples/embedded/qmltwitter/qmltwitter.cpp index f63f9055ef..f63f9055ef 100644 --- a/demos/embedded/qmltwitter/qmltwitter.cpp +++ b/examples/embedded/qmltwitter/qmltwitter.cpp diff --git a/demos/embedded/qmltwitter/qmltwitter.pro b/examples/embedded/qmltwitter/qmltwitter.pro index 197afd3431..197afd3431 100644 --- a/demos/embedded/qmltwitter/qmltwitter.pro +++ b/examples/embedded/qmltwitter/qmltwitter.pro diff --git a/qtdeclarative.pro b/qtdeclarative.pro index 678fdf3398..084a7200c5 100644 --- a/qtdeclarative.pro +++ b/qtdeclarative.pro @@ -7,13 +7,6 @@ module_qtdeclarative_tools.subdir = tools module_qtdeclarative_tools.target = module-qtdeclarative-tools module_qtdeclarative_tools.depends = module_qtdeclarative_src -module_qtdeclarative_demos.subdir = demos -module_qtdeclarative_demos.target = module-qtdeclarative-demos -module_qtdeclarative_demos.depends = module_qtdeclarative_src -!contains(QT_BUILD_PARTS,demos) { - module_qtdeclarative_demos.CONFIG = no_default_target no_default_install -} - module_qtdeclarative_examples.subdir = examples/declarative module_qtdeclarative_examples.target = module-qtdeclarative-examples module_qtdeclarative_examples.depends = module_qtdeclarative_src @@ -29,6 +22,5 @@ module_qtdeclarative_tests.CONFIG = no_default_install SUBDIRS += module_qtdeclarative_src \ module_qtdeclarative_tools \ - module_qtdeclarative_demos \ module_qtdeclarative_examples \ module_qtdeclarative_tests \ |