Start of examples refactor
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 20 Feb 2012 00:34:44 +0000 (10:34 +1000)
committerQt by Nokia <qt-info@nokia.com>
Fri, 24 Feb 2012 09:24:58 +0000 (10:24 +0100)
This is the general reorg of the examples directory structure, plus additional
guidelines.

calculator, animations and accessibility have been updated to the new standards
and tested, as an example.

Task-number: QTBUG-24133
Change-Id: I76c3b86751d3195ba2a5474ff23afb875765e9a4
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
896 files changed:
.gitignore
doc/config/qtquick.qdocconf
doc/src/examples/examples-groups.qdoc
doc/src/examples/examples-toys.qdoc
examples/HACKING [new file with mode: 0644]
examples/README [moved from examples/declarative/README with 99% similarity]
examples/declarative/declarative.pro [deleted file]
examples/declarative/imageelements/borderimage.qml [deleted file]
examples/declarative/imageelements/image.qml [deleted file]
examples/declarative/shadereffects/shadereffects.qml [deleted file]
examples/declarative/tutorials/tutorials.pro [deleted file]
examples/declarative/tutorials/tutorials.qmlproject [deleted file]
examples/demos/calculator/CalculatorCore/Button.qml [moved from examples/declarative/calculator/content/Button.qml with 98% similarity]
examples/demos/calculator/CalculatorCore/Display.qml [moved from examples/declarative/calculator/content/Display.qml with 100% similarity]
examples/demos/calculator/CalculatorCore/calculator.js [moved from examples/declarative/calculator/content/calculator.js with 96% similarity]
examples/demos/calculator/CalculatorCore/images/button-.png [moved from examples/declarative/calculator/content/images/button-.png with 100% similarity]
examples/demos/calculator/CalculatorCore/images/button-blue.png [moved from examples/declarative/calculator/content/images/button-blue.png with 100% similarity]
examples/demos/calculator/CalculatorCore/images/button-green.png [moved from examples/declarative/calculator/content/images/button-green.png with 100% similarity]
examples/demos/calculator/CalculatorCore/images/button-purple.png [moved from examples/declarative/calculator/content/images/button-purple.png with 100% similarity]
examples/demos/calculator/CalculatorCore/images/button-red.png [moved from examples/declarative/calculator/content/images/button-red.png with 100% similarity]
examples/demos/calculator/CalculatorCore/images/display.png [moved from examples/declarative/calculator/content/images/display.png with 100% similarity]
examples/demos/calculator/CalculatorCore/qmldir [moved from examples/declarative/calculator/content/qmldir with 100% similarity]
examples/demos/calculator/calculator-desktop.qml [new file with mode: 0644]
examples/demos/calculator/calculator-mobile.qml [moved from examples/declarative/calculator/calculator.qml with 97% similarity]
examples/demos/calculator/calculator.pro [new file with mode: 0644]
examples/demos/calculator/calculator.qdoc [new file with mode: 0644]
examples/demos/calculator/main.cpp [new file with mode: 0644]
examples/demos/clocks/clocks.qml [moved from examples/declarative/toys/clocks/clocks.qml with 100% similarity]
examples/demos/clocks/content/Clock.qml [moved from examples/declarative/toys/clocks/content/Clock.qml with 100% similarity]
examples/demos/clocks/content/QuitButton.qml [moved from examples/declarative/ui-components/dialcontrol/content/QuitButton.qml with 100% similarity]
examples/demos/clocks/content/arrow.png [moved from examples/declarative/toys/clocks/content/arrow.png with 100% similarity]
examples/demos/clocks/content/background.png [moved from examples/declarative/toys/clocks/content/background.png with 100% similarity]
examples/demos/clocks/content/center.png [moved from examples/declarative/toys/clocks/content/center.png with 100% similarity]
examples/demos/clocks/content/clock-night.png [moved from examples/declarative/toys/clocks/content/clock-night.png with 100% similarity]
examples/demos/clocks/content/clock.png [moved from examples/declarative/toys/clocks/content/clock.png with 100% similarity]
examples/demos/clocks/content/hour.png [moved from examples/declarative/toys/clocks/content/hour.png with 100% similarity]
examples/demos/clocks/content/minute.png [moved from examples/declarative/toys/clocks/content/minute.png with 100% similarity]
examples/demos/clocks/content/quit.png [moved from examples/declarative/ui-components/dialcontrol/content/quit.png with 100% similarity]
examples/demos/clocks/content/second.png [moved from examples/declarative/toys/clocks/content/second.png with 100% similarity]
examples/demos/corkboards/content/Day.qml [moved from examples/declarative/toys/corkboards/content/Day.qml with 100% similarity]
examples/demos/corkboards/content/cork.jpg [moved from examples/declarative/toys/corkboards/content/cork.jpg with 100% similarity]
examples/demos/corkboards/content/note-yellow.png [moved from examples/declarative/toys/corkboards/content/note-yellow.png with 100% similarity]
examples/demos/corkboards/content/tack.png [moved from examples/declarative/toys/corkboards/content/tack.png with 100% similarity]
examples/demos/corkboards/corkboards.qml [moved from examples/declarative/toys/corkboards/corkboards.qml with 100% similarity]
examples/demos/demos.pro [new file with mode: 0644]
examples/demos/dynamicscene/content/Button.qml [moved from examples/declarative/toys/dynamicscene/content/Button.qml with 100% similarity]
examples/demos/dynamicscene/content/GenericSceneItem.qml [moved from examples/declarative/toys/dynamicscene/content/GenericSceneItem.qml with 100% similarity]
examples/demos/dynamicscene/content/PaletteItem.qml [moved from examples/declarative/toys/dynamicscene/content/PaletteItem.qml with 100% similarity]
examples/demos/dynamicscene/content/PerspectiveItem.qml [moved from examples/declarative/toys/dynamicscene/content/PerspectiveItem.qml with 100% similarity]
examples/demos/dynamicscene/content/Sun.qml [moved from examples/declarative/toys/dynamicscene/content/Sun.qml with 100% similarity]
examples/demos/dynamicscene/content/images/NOTE [moved from examples/declarative/toys/dynamicscene/content/images/NOTE with 100% similarity]
examples/demos/dynamicscene/content/images/face-smile.png [moved from examples/declarative/toys/dynamicscene/content/images/face-smile.png with 100% similarity]
examples/demos/dynamicscene/content/images/moon.png [moved from examples/declarative/toys/dynamicscene/content/images/moon.png with 100% similarity]
examples/demos/dynamicscene/content/images/rabbit_brown.png [moved from examples/declarative/toys/dynamicscene/content/images/rabbit_brown.png with 100% similarity]
examples/demos/dynamicscene/content/images/rabbit_bw.png [moved from examples/declarative/toys/dynamicscene/content/images/rabbit_bw.png with 100% similarity]
examples/demos/dynamicscene/content/images/star.png [moved from examples/declarative/toys/dynamicscene/content/images/star.png with 100% similarity]
examples/demos/dynamicscene/content/images/sun.png [moved from examples/declarative/toys/dynamicscene/content/images/sun.png with 100% similarity]
examples/demos/dynamicscene/content/images/tree_s.png [moved from examples/declarative/toys/dynamicscene/content/images/tree_s.png with 100% similarity]
examples/demos/dynamicscene/content/itemCreation.js [moved from examples/declarative/toys/dynamicscene/content/itemCreation.js with 100% similarity]
examples/demos/dynamicscene/dynamicscene.qml [moved from examples/declarative/toys/dynamicscene/dynamicscene.qml with 99% similarity]
examples/demos/flickr/content/Button.qml [moved from examples/declarative/flickr/content/Button.qml with 100% similarity]
examples/demos/flickr/content/GridDelegate.qml [moved from examples/declarative/flickr/content/GridDelegate.qml with 100% similarity]
examples/demos/flickr/content/ImageDetails.qml [moved from examples/declarative/flickr/content/ImageDetails.qml with 100% similarity]
examples/demos/flickr/content/ListDelegate.qml [moved from examples/declarative/flickr/content/ListDelegate.qml with 100% similarity]
examples/demos/flickr/content/Progress.qml [moved from examples/declarative/flickr/content/Progress.qml with 100% similarity]
examples/demos/flickr/content/RssModel.qml [moved from examples/declarative/flickr/content/RssModel.qml with 100% similarity]
examples/demos/flickr/content/ScrollBar.qml [moved from examples/declarative/flickr/content/ScrollBar.qml with 100% similarity]
examples/demos/flickr/content/Slider.qml [moved from examples/declarative/flickr/content/Slider.qml with 100% similarity]
examples/demos/flickr/content/TitleBar.qml [moved from examples/declarative/flickr/content/TitleBar.qml with 100% similarity]
examples/demos/flickr/content/ToolBar.qml [moved from examples/declarative/flickr/content/ToolBar.qml with 100% similarity]
examples/demos/flickr/content/UnifiedDelegate.qml [moved from examples/declarative/flickr/content/UnifiedDelegate.qml with 100% similarity]
examples/demos/flickr/content/images/gloss.png [moved from examples/declarative/twitter/TwitterCore/images/gloss.png with 100% similarity]
examples/demos/flickr/content/images/lineedit.png [moved from examples/declarative/twitter/TwitterCore/images/lineedit.png with 100% similarity]
examples/demos/flickr/content/images/lineedit.sci [moved from examples/declarative/twitter/TwitterCore/images/lineedit.sci with 100% similarity]
examples/demos/flickr/content/images/noise.png [moved from examples/declarative/flickr/content/images/noise.png with 100% similarity]
examples/demos/flickr/content/images/particle.png [moved from examples/declarative/flickr/content/images/particle.png with 100% similarity]
examples/demos/flickr/content/images/quit.png [moved from examples/declarative/twitter/TwitterCore/images/quit.png with 100% similarity]
examples/demos/flickr/content/images/squareParticle.png [moved from examples/declarative/flickr/content/images/squareParticle.png with 100% similarity]
examples/demos/flickr/content/images/stripes.png [moved from examples/declarative/twitter/TwitterCore/images/stripes.png with 100% similarity]
examples/demos/flickr/content/images/titlebar.png [moved from examples/declarative/twitter/TwitterCore/images/titlebar.png with 100% similarity]
examples/demos/flickr/content/images/titlebar.sci [moved from examples/declarative/twitter/TwitterCore/images/titlebar.sci with 100% similarity]
examples/demos/flickr/content/images/toolbutton.png [moved from examples/declarative/twitter/TwitterCore/images/toolbutton.png with 100% similarity]
examples/demos/flickr/content/images/toolbutton.sci [moved from examples/declarative/twitter/TwitterCore/images/toolbutton.sci with 100% similarity]
examples/demos/flickr/content/qmldir [moved from examples/declarative/flickr/content/qmldir with 100% similarity]
examples/demos/flickr/flickr-90.qml [moved from examples/declarative/flickr/flickr-90.qml with 100% similarity]
examples/demos/flickr/flickr.qml [moved from examples/declarative/flickr/flickr.qml with 100% similarity]
examples/demos/flickr/flickr.qmlproject [moved from examples/declarative/flickr/flickr.qmlproject with 100% similarity]
examples/demos/minehunt/MinehuntCore/Explosion.qml [moved from examples/declarative/minehunt/MinehuntCore/Explosion.qml with 100% similarity]
examples/demos/minehunt/MinehuntCore/Tile.qml [moved from examples/declarative/minehunt/MinehuntCore/Tile.qml with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/back.png [moved from examples/declarative/minehunt/MinehuntCore/pics/back.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/background.png [moved from examples/declarative/samegame/content/pics/background.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/bomb-color.png [moved from examples/declarative/minehunt/MinehuntCore/pics/bomb-color.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/bomb.png [moved from examples/declarative/minehunt/MinehuntCore/pics/bomb.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/face-sad.png [moved from examples/declarative/minehunt/MinehuntCore/pics/face-sad.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/face-smile-big.png [moved from examples/declarative/minehunt/MinehuntCore/pics/face-smile-big.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/face-smile.png [moved from examples/declarative/shadereffects/content/face-smile.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/flag-color.png [moved from examples/declarative/minehunt/MinehuntCore/pics/flag-color.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/flag.png [moved from examples/declarative/minehunt/MinehuntCore/pics/flag.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/front.png [moved from examples/declarative/minehunt/MinehuntCore/pics/front.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/quit.png [moved from examples/declarative/toys/clocks/content/quit.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/pics/star.png [moved from examples/declarative/minehunt/MinehuntCore/pics/star.png with 100% similarity]
examples/demos/minehunt/MinehuntCore/qmldir [moved from examples/declarative/minehunt/MinehuntCore/qmldir with 100% similarity]
examples/demos/minehunt/README [moved from examples/declarative/minehunt/README with 100% similarity]
examples/demos/minehunt/main.cpp [moved from examples/declarative/minehunt/main.cpp with 100% similarity]
examples/demos/minehunt/minehunt.cpp [moved from examples/declarative/minehunt/minehunt.cpp with 100% similarity]
examples/demos/minehunt/minehunt.h [moved from examples/declarative/minehunt/minehunt.h with 100% similarity]
examples/demos/minehunt/minehunt.pro [moved from examples/declarative/minehunt/minehunt.pro with 100% similarity]
examples/demos/minehunt/minehunt.qml [moved from examples/declarative/minehunt/minehunt.qml with 100% similarity]
examples/demos/minehunt/minehunt.qmlproject [moved from examples/declarative/minehunt/minehunt.qmlproject with 100% similarity]
examples/demos/minehunt/minehunt.qrc [moved from examples/declarative/minehunt/minehunt.qrc with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml [moved from examples/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml [moved from examples/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/Button.qml [moved from examples/declarative/photoviewer/PhotoViewerCore/Button.qml with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml [moved from examples/declarative/photoviewer/PhotoViewerCore/EditableButton.qml with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml [moved from examples/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml [moved from examples/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/RssModel.qml [moved from examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/Tag.qml [moved from examples/declarative/photoviewer/PhotoViewerCore/Tag.qml with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/images/box-shadow.png [moved from examples/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/images/busy.png [moved from examples/declarative/rssnews/content/images/busy.png with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/images/cardboard.png [moved from examples/declarative/photoviewer/PhotoViewerCore/images/cardboard.png with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/qmldir [moved from examples/declarative/photoviewer/PhotoViewerCore/qmldir with 100% similarity]
examples/demos/photoviewer/PhotoViewerCore/script/script.js [moved from examples/declarative/photoviewer/PhotoViewerCore/script/script.js with 100% similarity]
examples/demos/photoviewer/i18n/base.ts [moved from examples/declarative/photoviewer/i18n/base.ts with 100% similarity]
examples/demos/photoviewer/i18n/qml_fr.qm [moved from examples/declarative/photoviewer/i18n/qml_fr.qm with 100% similarity]
examples/demos/photoviewer/i18n/qml_fr.ts [moved from examples/declarative/photoviewer/i18n/qml_fr.ts with 100% similarity]
examples/demos/photoviewer/photoviewer.qml [moved from examples/declarative/photoviewer/photoviewer.qml with 100% similarity]
examples/demos/photoviewer/photoviewer.qmlproject [moved from examples/declarative/photoviewer/photoviewer.qmlproject with 100% similarity]
examples/demos/plasmapatrol/PlasmaPatrol.qmlproject [moved from examples/declarative/particles/plasmapatrol/PlasmaPatrol.qmlproject with 100% similarity]
examples/demos/plasmapatrol/TODO [moved from examples/declarative/particles/plasmapatrol/TODO with 100% similarity]
examples/demos/plasmapatrol/content/BlasterHardpoint.qml [moved from examples/declarative/particles/plasmapatrol/content/BlasterHardpoint.qml with 100% similarity]
examples/demos/plasmapatrol/content/Button.qml [moved from examples/declarative/particles/plasmapatrol/content/Button.qml with 100% similarity]
examples/demos/plasmapatrol/content/CannonHardpoint.qml [moved from examples/declarative/particles/plasmapatrol/content/CannonHardpoint.qml with 100% similarity]
examples/demos/plasmapatrol/content/ChoiceBox.qml [moved from examples/declarative/particles/plasmapatrol/content/ChoiceBox.qml with 100% similarity]
examples/demos/plasmapatrol/content/Cruiser.qml [moved from examples/declarative/particles/plasmapatrol/content/Cruiser.qml with 100% similarity]
examples/demos/plasmapatrol/content/Frigate.qml [moved from examples/declarative/particles/plasmapatrol/content/Frigate.qml with 100% similarity]
examples/demos/plasmapatrol/content/Hardpoint.qml [moved from examples/declarative/particles/plasmapatrol/content/Hardpoint.qml with 100% similarity]
examples/demos/plasmapatrol/content/HelpScreens.qml [moved from examples/declarative/particles/plasmapatrol/content/HelpScreens.qml with 100% similarity]
examples/demos/plasmapatrol/content/LaserHardpoint.qml [moved from examples/declarative/particles/plasmapatrol/content/LaserHardpoint.qml with 100% similarity]
examples/demos/plasmapatrol/content/PlasmaPatrolParticles.qml [moved from examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml with 100% similarity]
examples/demos/plasmapatrol/content/SequentialLoader.qml [moved from examples/declarative/particles/plasmapatrol/content/SequentialLoader.qml with 100% similarity]
examples/demos/plasmapatrol/content/Ship.qml [moved from examples/declarative/particles/plasmapatrol/content/Ship.qml with 100% similarity]
examples/demos/plasmapatrol/content/Sloop.qml [moved from examples/declarative/particles/plasmapatrol/content/Sloop.qml with 100% similarity]
examples/demos/plasmapatrol/content/pics/TitleText.png [moved from examples/declarative/particles/plasmapatrol/content/pics/TitleText.png with 100% similarity]
examples/demos/plasmapatrol/content/pics/blur-circle2.png [moved from examples/declarative/particles/plasmapatrol/content/pics/blur-circle2.png with 100% similarity]
examples/demos/plasmapatrol/content/pics/blur-circle3.png [moved from examples/declarative/touchinteraction/multipointtouch/content/blur-circle3.png with 100% similarity]
examples/demos/plasmapatrol/content/pics/finalfrontier.png [moved from examples/declarative/particles/plasmapatrol/content/pics/finalfrontier.png with 100% similarity]
examples/demos/plasmapatrol/content/pics/meteor.png [moved from examples/declarative/particles/plasmapatrol/content/pics/meteor.png with 100% similarity]
examples/demos/plasmapatrol/content/pics/meteor_explo.png [moved from examples/declarative/particles/plasmapatrol/content/pics/meteor_explo.png with 100% similarity]
examples/demos/plasmapatrol/content/pics/nullRock.png [moved from examples/declarative/particles/plasmapatrol/content/pics/nullRock.png with 100% similarity]
examples/demos/plasmapatrol/content/pics/particle.png [moved from examples/declarative/samegame/content/pics/particle.png with 100% similarity]
examples/demos/plasmapatrol/content/pics/star.png [moved from examples/declarative/particles/plasmapatrol/content/pics/star.png with 100% similarity]
examples/demos/plasmapatrol/content/pics/star2.png [moved from examples/declarative/particles/plasmapatrol/content/pics/star2.png with 100% similarity]
examples/demos/plasmapatrol/content/pics/star3.png [moved from examples/declarative/particles/plasmapatrol/content/pics/star3.png with 100% similarity]
examples/demos/plasmapatrol/plasmapatrol.qml [moved from examples/declarative/particles/plasmapatrol/plasmapatrol.qml with 100% similarity]
examples/demos/rssnews/content/BusyIndicator.qml [moved from examples/declarative/rssnews/content/BusyIndicator.qml with 100% similarity]
examples/demos/rssnews/content/CategoryDelegate.qml [moved from examples/declarative/rssnews/content/CategoryDelegate.qml with 100% similarity]
examples/demos/rssnews/content/NewsDelegate.qml [moved from examples/declarative/rssnews/content/NewsDelegate.qml with 100% similarity]
examples/demos/rssnews/content/RssFeeds.qml [moved from examples/declarative/rssnews/content/RssFeeds.qml with 100% similarity]
examples/demos/rssnews/content/ScrollBar.qml [moved from examples/declarative/rssnews/content/ScrollBar.qml with 100% similarity]
examples/demos/rssnews/content/images/busy.png [moved from examples/declarative/photoviewer/PhotoViewerCore/images/busy.png with 100% similarity]
examples/demos/rssnews/content/images/scrollbar.png [moved from examples/declarative/rssnews/content/images/scrollbar.png with 100% similarity]
examples/demos/rssnews/rssnews.qml [moved from examples/declarative/rssnews/rssnews.qml with 100% similarity]
examples/demos/rssnews/rssnews.qmlproject [moved from examples/declarative/rssnews/rssnews.qmlproject with 100% similarity]
examples/demos/samegame/content/BoomBlock.qml [moved from examples/declarative/samegame/content/BoomBlock.qml with 100% similarity]
examples/demos/samegame/content/Button.qml [moved from examples/declarative/samegame/content/Button.qml with 100% similarity]
examples/demos/samegame/content/Dialog.qml [moved from examples/declarative/samegame/content/Dialog.qml with 100% similarity]
examples/demos/samegame/content/GameArea.qml [moved from examples/declarative/samegame/content/GameArea.qml with 100% similarity]
examples/demos/samegame/content/NameInputDialog.qml [moved from examples/declarative/samegame/content/NameInputDialog.qml with 100% similarity]
examples/demos/samegame/content/pics/background.png [moved from examples/declarative/minehunt/MinehuntCore/pics/background.png with 100% similarity]
examples/demos/samegame/content/pics/blueStone.png [moved from examples/declarative/tutorials/samegame/shared/pics/blueStone.png with 100% similarity]
examples/demos/samegame/content/pics/greenStone.png [moved from examples/declarative/tutorials/samegame/shared/pics/greenStone.png with 100% similarity]
examples/demos/samegame/content/pics/particle.png [moved from examples/declarative/particles/plasmapatrol/content/pics/particle.png with 100% similarity]
examples/demos/samegame/content/pics/redStone.png [moved from examples/declarative/tutorials/samegame/shared/pics/redStone.png with 100% similarity]
examples/demos/samegame/content/pics/yellowStone.png [moved from examples/declarative/tutorials/samegame/shared/pics/yellowStone.png with 100% similarity]
examples/demos/samegame/content/samegame.js [moved from examples/declarative/samegame/content/samegame.js with 100% similarity]
examples/demos/samegame/samegame.qml [moved from examples/declarative/samegame/samegame.qml with 100% similarity]
examples/demos/samegame/samegame.qmlproject [moved from examples/declarative/samegame/samegame.qmlproject with 100% similarity]
examples/demos/snake/content/Button.qml [moved from examples/declarative/snake/content/Button.qml with 100% similarity]
examples/demos/snake/content/Cookie.qml [moved from examples/declarative/snake/content/Cookie.qml with 100% similarity]
examples/demos/snake/content/HighScoreModel.qml [moved from examples/declarative/snake/content/HighScoreModel.qml with 100% similarity]
examples/demos/snake/content/Link.qml [moved from examples/declarative/snake/content/Link.qml with 100% similarity]
examples/demos/snake/content/Skull.qml [moved from examples/declarative/snake/content/Skull.qml with 87% similarity]
examples/demos/snake/content/pics/README [moved from examples/declarative/snake/content/pics/README with 100% similarity]
examples/demos/snake/content/pics/background.png [moved from examples/declarative/snake/content/pics/background.png with 100% similarity]
examples/demos/snake/content/pics/blueStar.png [moved from examples/declarative/snake/content/pics/blueStar.png with 100% similarity]
examples/demos/snake/content/pics/blueStone.png [moved from examples/declarative/snake/content/pics/blueStone.png with 100% similarity]
examples/demos/snake/content/pics/cookie.png [moved from examples/declarative/snake/content/pics/cookie.png with 100% similarity]
examples/demos/snake/content/pics/eyes.svg [moved from examples/declarative/snake/content/pics/eyes.svg with 100% similarity]
examples/demos/snake/content/pics/head.png [moved from examples/declarative/snake/content/pics/head.png with 100% similarity]
examples/demos/snake/content/pics/pause.png [moved from examples/declarative/snake/content/pics/pause.png with 100% similarity]
examples/demos/snake/content/pics/redStar.png [moved from examples/declarative/snake/content/pics/redStar.png with 100% similarity]
examples/demos/snake/content/pics/redStone.png [moved from examples/declarative/snake/content/pics/redStone.png with 100% similarity]
examples/demos/snake/content/pics/skull.png [moved from examples/declarative/snake/content/pics/skull.png with 100% similarity]
examples/demos/snake/content/pics/snake.jpg [moved from examples/declarative/snake/content/pics/snake.jpg with 100% similarity]
examples/demos/snake/content/pics/star.png [moved from examples/declarative/tutorials/samegame/shared/pics/star.png with 100% similarity]
examples/demos/snake/content/pics/stoneShadow.png [moved from examples/declarative/snake/content/pics/stoneShadow.png with 100% similarity]
examples/demos/snake/content/pics/yellowStar.png [moved from examples/declarative/snake/content/pics/yellowStar.png with 100% similarity]
examples/demos/snake/content/pics/yellowStone.png [moved from examples/declarative/snake/content/pics/yellowStone.png with 100% similarity]
examples/demos/snake/content/snake.js [moved from examples/declarative/snake/content/snake.js with 100% similarity]
examples/demos/snake/snake.qml [moved from examples/declarative/snake/snake.qml with 93% similarity]
examples/demos/snake/snake.qmlproject [moved from examples/declarative/snake/snake.qmlproject with 100% similarity]
examples/demos/tic-tac-toe/content/Button.qml [moved from examples/declarative/toys/tic-tac-toe/content/Button.qml with 100% similarity]
examples/demos/tic-tac-toe/content/TicTac.qml [moved from examples/declarative/toys/tic-tac-toe/content/TicTac.qml with 100% similarity]
examples/demos/tic-tac-toe/content/pics/board.png [moved from examples/declarative/toys/tic-tac-toe/content/pics/board.png with 100% similarity]
examples/demos/tic-tac-toe/content/pics/o.png [moved from examples/declarative/toys/tic-tac-toe/content/pics/o.png with 100% similarity]
examples/demos/tic-tac-toe/content/pics/x.png [moved from examples/declarative/toys/tic-tac-toe/content/pics/x.png with 100% similarity]
examples/demos/tic-tac-toe/content/tic-tac-toe.js [moved from examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js with 100% similarity]
examples/demos/tic-tac-toe/tic-tac-toe.qml [moved from examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml with 100% similarity]
examples/demos/tvtennis/tvtennis.qml [moved from examples/declarative/toys/tvtennis/tvtennis.qml with 100% similarity]
examples/demos/twitter/TwitterCore/Button.qml [moved from examples/declarative/twitter/TwitterCore/Button.qml with 100% similarity]
examples/demos/twitter/TwitterCore/FatDelegate.qml [moved from examples/declarative/twitter/TwitterCore/FatDelegate.qml with 100% similarity]
examples/demos/twitter/TwitterCore/Input.qml [moved from examples/declarative/twitter/TwitterCore/Input.qml with 100% similarity]
examples/demos/twitter/TwitterCore/Loading.qml [moved from examples/declarative/twitter/TwitterCore/Loading.qml with 100% similarity]
examples/demos/twitter/TwitterCore/MultiTitleBar.qml [moved from examples/declarative/twitter/TwitterCore/MultiTitleBar.qml with 100% similarity]
examples/demos/twitter/TwitterCore/RssModel.qml [moved from examples/declarative/twitter/TwitterCore/RssModel.qml with 100% similarity]
examples/demos/twitter/TwitterCore/SearchView.qml [moved from examples/declarative/twitter/TwitterCore/SearchView.qml with 100% similarity]
examples/demos/twitter/TwitterCore/TitleBar.qml [moved from examples/declarative/twitter/TwitterCore/TitleBar.qml with 100% similarity]
examples/demos/twitter/TwitterCore/ToolBar.qml [moved from examples/declarative/twitter/TwitterCore/ToolBar.qml with 100% similarity]
examples/demos/twitter/TwitterCore/UserModel.qml [moved from examples/declarative/twitter/TwitterCore/UserModel.qml with 100% similarity]
examples/demos/twitter/TwitterCore/images/gloss.png [moved from examples/declarative/flickr/content/images/gloss.png with 100% similarity]
examples/demos/twitter/TwitterCore/images/lineedit.png [moved from examples/declarative/flickr/content/images/lineedit.png with 100% similarity]
examples/demos/twitter/TwitterCore/images/lineedit.sci [moved from examples/declarative/flickr/content/images/lineedit.sci with 100% similarity]
examples/demos/twitter/TwitterCore/images/loading.png [moved from examples/declarative/twitter/TwitterCore/images/loading.png with 100% similarity]
examples/demos/twitter/TwitterCore/images/quit.png [moved from examples/declarative/flickr/content/images/quit.png with 100% similarity]
examples/demos/twitter/TwitterCore/images/stripes.png [moved from examples/declarative/flickr/content/images/stripes.png with 100% similarity]
examples/demos/twitter/TwitterCore/images/titlebar.png [moved from examples/declarative/flickr/content/images/titlebar.png with 100% similarity]
examples/demos/twitter/TwitterCore/images/titlebar.sci [moved from examples/declarative/flickr/content/images/titlebar.sci with 100% similarity]
examples/demos/twitter/TwitterCore/images/toolbutton.png [moved from examples/declarative/flickr/content/images/toolbutton.png with 100% similarity]
examples/demos/twitter/TwitterCore/images/toolbutton.sci [moved from examples/declarative/flickr/content/images/toolbutton.sci with 100% similarity]
examples/demos/twitter/TwitterCore/qmldir [moved from examples/declarative/twitter/TwitterCore/qmldir with 100% similarity]
examples/demos/twitter/twitter.qml [moved from examples/declarative/twitter/twitter.qml with 100% similarity]
examples/demos/twitter/twitter.qmlproject [moved from examples/declarative/twitter/twitter.qmlproject with 100% similarity]
examples/embedded/embedded.pro [deleted file]
examples/embedded/qmlcalculator/deployment.pri [deleted file]
examples/embedded/qmlcalculator/qmlcalculator.cpp [deleted file]
examples/embedded/qmlcalculator/qmlcalculator.pro [deleted file]
examples/embedded/qmlclocks/deployment.pri [deleted file]
examples/embedded/qmlclocks/qmlclocks.cpp [deleted file]
examples/embedded/qmlclocks/qmlclocks.pro [deleted file]
examples/embedded/qmldialcontrol/deployment.pri [deleted file]
examples/embedded/qmldialcontrol/qmldialcontrol.cpp [deleted file]
examples/embedded/qmldialcontrol/qmldialcontrol.pro [deleted file]
examples/embedded/qmleasing/deployment.pri [deleted file]
examples/embedded/qmleasing/qmleasing.cpp [deleted file]
examples/embedded/qmleasing/qmleasing.pro [deleted file]
examples/embedded/qmlflickr/deployment.pri [deleted file]
examples/embedded/qmlflickr/qmlflickr.cpp [deleted file]
examples/embedded/qmlflickr/qmlflickr.pro [deleted file]
examples/embedded/qmlphotoviewer/deployment.pri [deleted file]
examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp [deleted file]
examples/embedded/qmlphotoviewer/qmlphotoviewer.pro [deleted file]
examples/embedded/qmltwitter/deployment.pri [deleted file]
examples/embedded/qmltwitter/qmltwitter.cpp [deleted file]
examples/embedded/qmltwitter/qmltwitter.pro [deleted file]
examples/examples.pro
examples/localstorage/hello.qml [moved from examples/declarative/sqllocalstorage/hello.qml with 100% similarity]
examples/localstorage/localstorage.pro [new file with mode: 0644]
examples/particles/affectors/age.qml [moved from examples/declarative/particles/affectors/age.qml with 100% similarity]
examples/particles/affectors/attractor.qml [moved from examples/declarative/particles/affectors/attractor.qml with 100% similarity]
examples/particles/affectors/customaffector.qml [moved from examples/declarative/particles/affectors/customaffector.qml with 100% similarity]
examples/particles/affectors/friction.qml [moved from examples/declarative/particles/affectors/friction.qml with 100% similarity]
examples/particles/affectors/gravity.qml [moved from examples/declarative/particles/affectors/gravity.qml with 100% similarity]
examples/particles/affectors/groupgoal.qml [moved from examples/declarative/particles/affectors/groupgoal.qml with 100% similarity]
examples/particles/affectors/move.qml [moved from examples/declarative/particles/affectors/move.qml with 100% similarity]
examples/particles/affectors/spritegoal.qml [moved from examples/declarative/particles/affectors/spritegoal.qml with 100% similarity]
examples/particles/affectors/turbulence.qml [moved from examples/declarative/particles/affectors/turbulence.qml with 100% similarity]
examples/particles/affectors/wander.qml [moved from examples/declarative/particles/affectors/wander.qml with 100% similarity]
examples/particles/customparticle/blurparticles.qml [moved from examples/declarative/particles/customparticle/blurparticles.qml with 100% similarity]
examples/particles/customparticle/fragmentshader.qml [moved from examples/declarative/particles/customparticle/fragmentshader.qml with 100% similarity]
examples/particles/customparticle/imagecolors.qml [moved from examples/declarative/particles/customparticle/imagecolors.qml with 100% similarity]
examples/particles/emitters/burstandpulse.qml [moved from examples/declarative/particles/emitters/burstandpulse.qml with 100% similarity]
examples/particles/emitters/customemitter.qml [moved from examples/declarative/particles/emitters/customemitter.qml with 100% similarity]
examples/particles/emitters/emitmask.qml [moved from examples/declarative/particles/emitters/emitmask.qml with 100% similarity]
examples/particles/emitters/maximumemitted.qml [moved from examples/declarative/particles/emitters/maximumemitted.qml with 100% similarity]
examples/particles/emitters/shapeanddirection.qml [moved from examples/declarative/particles/emitters/shapeanddirection.qml with 100% similarity]
examples/particles/emitters/timedgroupchanges.qml [moved from examples/declarative/particles/emitters/timedgroupchanges.qml with 100% similarity]
examples/particles/emitters/trailemitter.qml [moved from examples/declarative/particles/emitters/trailemitter.qml with 100% similarity]
examples/particles/emitters/velocityfrommotion.qml [moved from examples/declarative/particles/emitters/velocityfrommotion.qml with 100% similarity]
examples/particles/exampleslauncher/content/Button.qml [moved from examples/declarative/particles/exampleslauncher/content/Button.qml with 100% similarity]
examples/particles/exampleslauncher/content/Shell.qml [moved from examples/declarative/particles/exampleslauncher/content/Shell.qml with 100% similarity]
examples/particles/exampleslauncher/content/launcher.js [moved from examples/declarative/particles/exampleslauncher/content/launcher.js with 100% similarity]
examples/particles/exampleslauncher/exampleslauncher.qml [moved from examples/declarative/particles/exampleslauncher/exampleslauncher.qml with 100% similarity]
examples/particles/imageparticle/allatonce.qml [moved from examples/declarative/particles/imageparticle/allatonce.qml with 100% similarity]
examples/particles/imageparticle/colored.qml [moved from examples/declarative/particles/imageparticle/colored.qml with 100% similarity]
examples/particles/imageparticle/colortable.qml [moved from examples/declarative/particles/imageparticle/colortable.qml with 100% similarity]
examples/particles/imageparticle/deformation.qml [moved from examples/declarative/particles/imageparticle/deformation.qml with 100% similarity]
examples/particles/imageparticle/rotation.qml [moved from examples/declarative/particles/imageparticle/rotation.qml with 100% similarity]
examples/particles/imageparticle/sharing.qml [moved from examples/declarative/particles/imageparticle/sharing.qml with 100% similarity]
examples/particles/imageparticle/sprites.qml [moved from examples/declarative/particles/imageparticle/sprites.qml with 100% similarity]
examples/particles/images/_explo.png [moved from examples/declarative/particles/images/_explo.png with 100% similarity]
examples/particles/images/backgroundLeaves.jpg [moved from examples/declarative/particles/images/backgroundLeaves.jpg with 100% similarity]
examples/particles/images/bear_tiles.png [moved from examples/declarative/particles/images/bear_tiles.png with 100% similarity]
examples/particles/images/candle.png [moved from examples/declarative/particles/images/candle.png with 100% similarity]
examples/particles/images/colortable.png [moved from examples/declarative/particles/images/colortable.png with 100% similarity]
examples/particles/images/finalfrontier.png [moved from examples/declarative/particles/images/finalfrontier.png with 100% similarity]
examples/particles/images/flower.png [moved from examples/declarative/particles/images/flower.png with 100% similarity]
examples/particles/images/launcherIcons/allatonce.png [moved from examples/declarative/particles/images/launcherIcons/allatonce.png with 100% similarity]
examples/particles/images/launcherIcons/attractor.png [moved from examples/declarative/particles/images/launcherIcons/attractor.png with 100% similarity]
examples/particles/images/launcherIcons/blurparticles.png [moved from examples/declarative/particles/images/launcherIcons/blurparticles.png with 100% similarity]
examples/particles/images/launcherIcons/close.png [moved from examples/declarative/particles/images/launcherIcons/close.png with 100% similarity]
examples/particles/images/launcherIcons/colortable.png [moved from examples/declarative/particles/images/launcherIcons/colortable.png with 100% similarity]
examples/particles/images/launcherIcons/customaffector.png [moved from examples/declarative/particles/images/launcherIcons/customaffector.png with 100% similarity]
examples/particles/images/launcherIcons/customemitter.png [moved from examples/declarative/particles/images/launcherIcons/customemitter.png with 100% similarity]
examples/particles/images/launcherIcons/deformation.png [moved from examples/declarative/particles/images/launcherIcons/deformation.png with 100% similarity]
examples/particles/images/launcherIcons/delegates.png [moved from examples/declarative/particles/images/launcherIcons/delegates.png with 100% similarity]
examples/particles/images/launcherIcons/dynamicemitters.png [moved from examples/declarative/particles/images/launcherIcons/dynamicemitters.png with 100% similarity]
examples/particles/images/launcherIcons/emitmask.png [moved from examples/declarative/particles/images/launcherIcons/emitmask.png with 100% similarity]
examples/particles/images/launcherIcons/flickr.png [moved from examples/declarative/particles/images/launcherIcons/flickr.png with 100% similarity]
examples/particles/images/launcherIcons/fragmentshader.png [moved from examples/declarative/particles/images/launcherIcons/fragmentshader.png with 100% similarity]
examples/particles/images/launcherIcons/gridsplosion.png [moved from examples/declarative/particles/images/launcherIcons/gridsplosion.png with 100% similarity]
examples/particles/images/launcherIcons/groupgoal.png [moved from examples/declarative/particles/images/launcherIcons/groupgoal.png with 100% similarity]
examples/particles/images/launcherIcons/imagecolors.png [moved from examples/declarative/particles/images/launcherIcons/imagecolors.png with 100% similarity]
examples/particles/images/launcherIcons/list.png [moved from examples/declarative/particles/images/launcherIcons/list.png with 100% similarity]
examples/particles/images/launcherIcons/maximumemitted.png [moved from examples/declarative/particles/images/launcherIcons/maximumemitted.png with 100% similarity]
examples/particles/images/launcherIcons/multiplepainters.png [moved from examples/declarative/particles/images/launcherIcons/multiplepainters.png with 100% similarity]
examples/particles/images/launcherIcons/package.png [moved from examples/declarative/particles/images/launcherIcons/package.png with 100% similarity]
examples/particles/images/launcherIcons/particleview.png [moved from examples/declarative/particles/images/launcherIcons/particleview.png with 100% similarity]
examples/particles/images/launcherIcons/plasmapatrol.png [moved from examples/declarative/particles/images/launcherIcons/plasmapatrol.png with 100% similarity]
examples/particles/images/launcherIcons/remove.png [moved from examples/declarative/particles/images/launcherIcons/remove.png with 100% similarity]
examples/particles/images/launcherIcons/rotation.png [moved from examples/declarative/particles/images/launcherIcons/rotation.png with 100% similarity]
examples/particles/images/launcherIcons/samegame.png [moved from examples/declarative/particles/images/launcherIcons/samegame.png with 100% similarity]
examples/particles/images/launcherIcons/shapeanddirection.png [moved from examples/declarative/particles/images/launcherIcons/shapeanddirection.png with 100% similarity]
examples/particles/images/launcherIcons/spaceexplorer.png [moved from examples/declarative/particles/images/launcherIcons/spaceexplorer.png with 100% similarity]
examples/particles/images/launcherIcons/spritegoal.png [moved from examples/declarative/particles/images/launcherIcons/spritegoal.png with 100% similarity]
examples/particles/images/launcherIcons/sprites.png [moved from examples/declarative/particles/images/launcherIcons/sprites.png with 100% similarity]
examples/particles/images/launcherIcons/spritevariedparticles.png [moved from examples/declarative/particles/images/launcherIcons/spritevariedparticles.png with 100% similarity]
examples/particles/images/launcherIcons/startstop.png [moved from examples/declarative/particles/images/launcherIcons/startstop.png with 100% similarity]
examples/particles/images/launcherIcons/timedgroupchanges.png [moved from examples/declarative/particles/images/launcherIcons/timedgroupchanges.png with 100% similarity]
examples/particles/images/launcherIcons/trailemitter.png [moved from examples/declarative/particles/images/launcherIcons/trailemitter.png with 100% similarity]
examples/particles/images/launcherIcons/trails.png [moved from examples/declarative/particles/images/launcherIcons/trails.png with 100% similarity]
examples/particles/images/launcherIcons/turbulence.png [moved from examples/declarative/particles/images/launcherIcons/turbulence.png with 100% similarity]
examples/particles/images/launcherIcons/velocityfrommotion.png [moved from examples/declarative/particles/images/launcherIcons/velocityfrommotion.png with 100% similarity]
examples/particles/images/launcherIcons/wander.png [moved from examples/declarative/particles/images/launcherIcons/wander.png with 100% similarity]
examples/particles/images/matchmask.png [moved from examples/declarative/particles/images/matchmask.png with 100% similarity]
examples/particles/images/meteor.png [moved from examples/declarative/particles/images/meteor.png with 100% similarity]
examples/particles/images/meteor_explo.png [moved from examples/declarative/particles/images/meteor_explo.png with 100% similarity]
examples/particles/images/meteors.png [moved from examples/declarative/particles/images/meteors.png with 100% similarity]
examples/particles/images/nullRock.png [moved from examples/declarative/particles/images/nullRock.png with 100% similarity]
examples/particles/images/particle.png [moved from examples/declarative/particles/images/particle.png with 100% similarity]
examples/particles/images/particle2.png [moved from examples/declarative/particles/images/particle2.png with 100% similarity]
examples/particles/images/particle3.png [moved from examples/declarative/particles/images/particle3.png with 100% similarity]
examples/particles/images/particle4.png [moved from examples/declarative/particles/images/particle4.png with 100% similarity]
examples/particles/images/particleA.png [moved from examples/declarative/particles/images/particleA.png with 100% similarity]
examples/particles/images/portal_bg.png [moved from examples/declarative/particles/images/portal_bg.png with 100% similarity]
examples/particles/images/realLeaf1.png [moved from examples/declarative/particles/images/realLeaf1.png with 100% similarity]
examples/particles/images/realLeaf2.png [moved from examples/declarative/particles/images/realLeaf2.png with 100% similarity]
examples/particles/images/realLeaf3.png [moved from examples/declarative/particles/images/realLeaf3.png with 100% similarity]
examples/particles/images/realLeaf4.png [moved from examples/declarative/particles/images/realLeaf4.png with 100% similarity]
examples/particles/images/rocket.png [moved from examples/declarative/particles/images/rocket.png with 100% similarity]
examples/particles/images/rocket2.png [moved from examples/declarative/particles/images/rocket2.png with 100% similarity]
examples/particles/images/sizeInOut.png [moved from examples/declarative/particles/images/sizeInOut.png with 100% similarity]
examples/particles/images/snowflake.png [moved from examples/declarative/particles/images/snowflake.png with 100% similarity]
examples/particles/images/sparkleSize.png [moved from examples/declarative/particles/images/sparkleSize.png with 100% similarity]
examples/particles/images/star.png [moved from examples/declarative/particles/images/star.png with 100% similarity]
examples/particles/images/starfish_0.png [moved from examples/declarative/particles/images/starfish_0.png with 100% similarity]
examples/particles/images/starfish_1.png [moved from examples/declarative/particles/images/starfish_1.png with 100% similarity]
examples/particles/images/starfish_2.png [moved from examples/declarative/particles/images/starfish_2.png with 100% similarity]
examples/particles/images/starfish_3.png [moved from examples/declarative/particles/images/starfish_3.png with 100% similarity]
examples/particles/images/starfish_4.png [moved from examples/declarative/particles/images/starfish_4.png with 100% similarity]
examples/particles/images/starfish_mask.png [moved from examples/declarative/particles/images/starfish_mask.png with 100% similarity]
examples/particles/itemparticle/content/Delegate.qml [moved from examples/declarative/particles/itemparticle/content/Delegate.qml with 100% similarity]
examples/particles/itemparticle/content/Delegate2.qml [moved from examples/declarative/particles/itemparticle/content/Delegate2.qml with 100% similarity]
examples/particles/itemparticle/content/ExpandingDelegate.qml [moved from examples/declarative/particles/itemparticle/content/ExpandingDelegate.qml with 100% similarity]
examples/particles/itemparticle/content/RssModel.qml [moved from examples/declarative/particles/itemparticle/content/RssModel.qml with 100% similarity]
examples/particles/itemparticle/content/bubble.png [moved from examples/declarative/particles/itemparticle/content/bubble.png with 100% similarity]
examples/particles/itemparticle/content/script.js [moved from examples/declarative/particles/itemparticle/content/script.js with 100% similarity]
examples/particles/itemparticle/delegates.qml [moved from examples/declarative/particles/itemparticle/delegates.qml with 100% similarity]
examples/particles/itemparticle/particleview.qml [moved from examples/declarative/particles/itemparticle/particleview.qml with 100% similarity]
examples/particles/particles.pro [new file with mode: 0644]
examples/particles/simple/dynamiccomparison.qml [moved from examples/declarative/particles/simple/dynamiccomparison.qml with 100% similarity]
examples/particles/simple/dynamicemitters.qml [moved from examples/declarative/particles/simple/dynamicemitters.qml with 100% similarity]
examples/particles/simple/multiplepainters.qml [moved from examples/declarative/particles/simple/multiplepainters.qml with 100% similarity]
examples/particles/simple/startstop.qml [moved from examples/declarative/particles/simple/startstop.qml with 100% similarity]
examples/qml/cppextensions/cppextensions.pro [moved from examples/declarative/cppextensions/cppextensions.pro with 100% similarity]
examples/qml/cppextensions/cppextensions.qmlproject [moved from examples/declarative/cppextensions/cppextensions.qmlproject with 100% similarity]
examples/qml/cppextensions/imageprovider/ImageProviderCore/qmldir [moved from examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir with 100% similarity]
examples/qml/cppextensions/imageprovider/imageprovider-example.qml [moved from examples/declarative/cppextensions/imageprovider/imageprovider-example.qml with 100% similarity]
examples/qml/cppextensions/imageprovider/imageprovider.cpp [moved from examples/declarative/cppextensions/imageprovider/imageprovider.cpp with 100% similarity]
examples/qml/cppextensions/imageprovider/imageprovider.pro [moved from examples/declarative/cppextensions/imageprovider/imageprovider.pro with 100% similarity]
examples/qml/cppextensions/imageprovider/imageprovider.qmlproject [moved from examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject with 100% similarity]
examples/qml/cppextensions/networkaccessmanagerfactory/main.cpp [moved from examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp with 100% similarity]
examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro [moved from examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro with 100% similarity]
examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject [moved from examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject with 100% similarity]
examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc [moved from examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc with 100% similarity]
examples/qml/cppextensions/networkaccessmanagerfactory/view.qml [moved from examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml with 100% similarity]
examples/qml/cppextensions/plugins/README [moved from examples/declarative/cppextensions/plugins/README with 100% similarity]
examples/qml/cppextensions/plugins/com/nokia/TimeExample/Clock.qml [moved from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml with 100% similarity]
examples/qml/cppextensions/plugins/com/nokia/TimeExample/center.png [moved from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png with 100% similarity]
examples/qml/cppextensions/plugins/com/nokia/TimeExample/clock.png [moved from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png with 100% similarity]
examples/qml/cppextensions/plugins/com/nokia/TimeExample/hour.png [moved from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png with 100% similarity]
examples/qml/cppextensions/plugins/com/nokia/TimeExample/minute.png [moved from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png with 100% similarity]
examples/qml/cppextensions/plugins/com/nokia/TimeExample/qmldir [moved from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir with 100% similarity]
examples/qml/cppextensions/plugins/plugin.cpp [moved from examples/declarative/cppextensions/plugins/plugin.cpp with 100% similarity]
examples/qml/cppextensions/plugins/plugins.pro [moved from examples/declarative/cppextensions/plugins/plugins.pro with 100% similarity]
examples/qml/cppextensions/plugins/plugins.qml [moved from examples/declarative/cppextensions/plugins/plugins.qml with 100% similarity]
examples/qml/cppextensions/plugins/plugins.qmlproject [moved from examples/declarative/cppextensions/plugins/plugins.qmlproject with 100% similarity]
examples/qml/cppextensions/referenceexamples/adding/adding.pro [moved from examples/declarative/cppextensions/referenceexamples/adding/adding.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/adding/adding.qrc [moved from examples/declarative/cppextensions/referenceexamples/adding/adding.qrc with 100% similarity]
examples/qml/cppextensions/referenceexamples/adding/example.qml [moved from examples/declarative/cppextensions/referenceexamples/adding/example.qml with 100% similarity]
examples/qml/cppextensions/referenceexamples/adding/main.cpp [moved from examples/declarative/cppextensions/referenceexamples/adding/main.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/adding/person.cpp [moved from examples/declarative/cppextensions/referenceexamples/adding/person.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/adding/person.h [moved from examples/declarative/cppextensions/referenceexamples/adding/person.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/attached/attached.pro [moved from examples/declarative/cppextensions/referenceexamples/attached/attached.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/attached/attached.qrc [moved from examples/declarative/cppextensions/referenceexamples/attached/attached.qrc with 100% similarity]
examples/qml/cppextensions/referenceexamples/attached/birthdayparty.cpp [moved from examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/attached/birthdayparty.h [moved from examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/attached/example.qml [moved from examples/declarative/cppextensions/referenceexamples/attached/example.qml with 100% similarity]
examples/qml/cppextensions/referenceexamples/attached/main.cpp [moved from examples/declarative/cppextensions/referenceexamples/attached/main.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/attached/person.cpp [moved from examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/attached/person.h [moved from examples/declarative/cppextensions/referenceexamples/valuesource/person.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/binding/binding.pro [moved from examples/declarative/cppextensions/referenceexamples/binding/binding.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/binding/binding.qrc [moved from examples/declarative/cppextensions/referenceexamples/binding/binding.qrc with 100% similarity]
examples/qml/cppextensions/referenceexamples/binding/birthdayparty.cpp [moved from examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/binding/birthdayparty.h [moved from examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/binding/example.qml [moved from examples/declarative/cppextensions/referenceexamples/binding/example.qml with 100% similarity]
examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.cpp [moved from examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.h [moved from examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/binding/main.cpp [moved from examples/declarative/cppextensions/referenceexamples/binding/main.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/binding/person.cpp [moved from examples/declarative/cppextensions/referenceexamples/binding/person.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/binding/person.h [moved from examples/declarative/cppextensions/referenceexamples/binding/person.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.cpp [moved from examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.h [moved from examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/coercion/coercion.pro [moved from examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/coercion/coercion.qrc [moved from examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc with 100% similarity]
examples/qml/cppextensions/referenceexamples/coercion/example.qml [moved from examples/declarative/cppextensions/referenceexamples/coercion/example.qml with 100% similarity]
examples/qml/cppextensions/referenceexamples/coercion/main.cpp [moved from examples/declarative/cppextensions/referenceexamples/coercion/main.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/coercion/person.cpp [moved from examples/declarative/cppextensions/referenceexamples/coercion/person.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/coercion/person.h [moved from examples/declarative/cppextensions/referenceexamples/coercion/person.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/default/birthdayparty.cpp [moved from examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/default/birthdayparty.h [moved from examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/default/default.pro [moved from examples/declarative/cppextensions/referenceexamples/default/default.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/default/default.qrc [moved from examples/declarative/cppextensions/referenceexamples/default/default.qrc with 100% similarity]
examples/qml/cppextensions/referenceexamples/default/example.qml [moved from examples/declarative/cppextensions/referenceexamples/default/example.qml with 100% similarity]
examples/qml/cppextensions/referenceexamples/default/main.cpp [moved from examples/declarative/cppextensions/referenceexamples/default/main.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/default/person.cpp [moved from examples/declarative/cppextensions/referenceexamples/default/person.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/default/person.h [moved from examples/declarative/cppextensions/referenceexamples/default/person.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/extended/example.qml [moved from examples/declarative/cppextensions/referenceexamples/extended/example.qml with 100% similarity]
examples/qml/cppextensions/referenceexamples/extended/extended.pro [moved from examples/declarative/cppextensions/referenceexamples/extended/extended.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/extended/extended.qrc [moved from examples/declarative/cppextensions/referenceexamples/extended/extended.qrc with 100% similarity]
examples/qml/cppextensions/referenceexamples/extended/lineedit.cpp [moved from examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/extended/lineedit.h [moved from examples/declarative/cppextensions/referenceexamples/extended/lineedit.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/extended/main.cpp [moved from examples/declarative/cppextensions/referenceexamples/extended/main.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.cpp [moved from examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.h [moved from examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/grouped/example.qml [moved from examples/declarative/cppextensions/referenceexamples/grouped/example.qml with 100% similarity]
examples/qml/cppextensions/referenceexamples/grouped/grouped.pro [moved from examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/grouped/grouped.qrc [moved from examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc with 100% similarity]
examples/qml/cppextensions/referenceexamples/grouped/main.cpp [moved from examples/declarative/cppextensions/referenceexamples/grouped/main.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/grouped/person.cpp [moved from examples/declarative/cppextensions/referenceexamples/signal/person.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/grouped/person.h [moved from examples/declarative/cppextensions/referenceexamples/grouped/person.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/methods/birthdayparty.cpp [moved from examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/methods/birthdayparty.h [moved from examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/methods/example.qml [moved from examples/declarative/cppextensions/referenceexamples/methods/example.qml with 100% similarity]
examples/qml/cppextensions/referenceexamples/methods/main.cpp [moved from examples/declarative/cppextensions/referenceexamples/methods/main.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/methods/methods.pro [moved from examples/declarative/cppextensions/referenceexamples/methods/methods.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/methods/methods.qrc [moved from examples/declarative/cppextensions/referenceexamples/methods/methods.qrc with 100% similarity]
examples/qml/cppextensions/referenceexamples/methods/person.cpp [moved from examples/declarative/cppextensions/referenceexamples/properties/person.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/methods/person.h [moved from examples/declarative/cppextensions/referenceexamples/properties/person.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/properties/birthdayparty.cpp [moved from examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/properties/birthdayparty.h [moved from examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/properties/example.qml [moved from examples/declarative/cppextensions/referenceexamples/properties/example.qml with 100% similarity]
examples/qml/cppextensions/referenceexamples/properties/main.cpp [moved from examples/declarative/cppextensions/referenceexamples/properties/main.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/properties/person.cpp [moved from examples/declarative/cppextensions/referenceexamples/methods/person.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/properties/person.h [moved from examples/declarative/cppextensions/referenceexamples/methods/person.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/properties/properties.pro [moved from examples/declarative/cppextensions/referenceexamples/properties/properties.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/properties/properties.qrc [moved from examples/declarative/cppextensions/referenceexamples/properties/properties.qrc with 100% similarity]
examples/qml/cppextensions/referenceexamples/referenceexamples.pro [moved from examples/declarative/cppextensions/referenceexamples/referenceexamples.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/referenceexamples.qmlproject [moved from examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject with 100% similarity]
examples/qml/cppextensions/referenceexamples/signal/birthdayparty.cpp [moved from examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/signal/birthdayparty.h [moved from examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/signal/example.qml [moved from examples/declarative/cppextensions/referenceexamples/signal/example.qml with 100% similarity]
examples/qml/cppextensions/referenceexamples/signal/main.cpp [moved from examples/declarative/cppextensions/referenceexamples/signal/main.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/signal/person.cpp [moved from examples/declarative/cppextensions/referenceexamples/grouped/person.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/signal/person.h [moved from examples/declarative/cppextensions/referenceexamples/signal/person.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/signal/signal.pro [moved from examples/declarative/cppextensions/referenceexamples/signal/signal.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/signal/signal.qrc [moved from examples/declarative/cppextensions/referenceexamples/signal/signal.qrc with 100% similarity]
examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.cpp [moved from examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.h [moved from examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/valuesource/example.qml [moved from examples/declarative/cppextensions/referenceexamples/valuesource/example.qml with 100% similarity]
examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp [moved from examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.h [moved from examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/valuesource/main.cpp [moved from examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/valuesource/person.cpp [moved from examples/declarative/cppextensions/referenceexamples/attached/person.cpp with 100% similarity]
examples/qml/cppextensions/referenceexamples/valuesource/person.h [moved from examples/declarative/cppextensions/referenceexamples/attached/person.h with 100% similarity]
examples/qml/cppextensions/referenceexamples/valuesource/valuesource.pro [moved from examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro with 100% similarity]
examples/qml/cppextensions/referenceexamples/valuesource/valuesource.qrc [moved from examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc with 100% similarity]
examples/qml/i18n/i18n.qml [moved from examples/declarative/i18n/i18n.qml with 100% similarity]
examples/qml/i18n/i18n/base.ts [moved from examples/declarative/i18n/i18n/base.ts with 100% similarity]
examples/qml/i18n/i18n/qml_en_AU.ts [moved from examples/declarative/i18n/i18n/qml_en_AU.ts with 100% similarity]
examples/qml/i18n/i18n/qml_fr.ts [moved from examples/declarative/i18n/i18n/qml_fr.ts with 100% similarity]
examples/qml/locale/locale.qml [moved from examples/declarative/locale/locale.qml with 100% similarity]
examples/qml/qml.pro [new file with mode: 0644]
examples/qml/script/script.pro [moved from examples/declarative/script/script.pro with 100% similarity]
examples/qml/script/shell/main.cpp [moved from examples/declarative/script/shell/main.cpp with 100% similarity]
examples/qml/script/shell/shell.pro [moved from examples/declarative/script/shell/shell.pro with 100% similarity]
examples/qml/xmlhttprequest/data.xml [moved from examples/declarative/xml/xmlhttprequest/data.xml with 100% similarity]
examples/qml/xmlhttprequest/xmlhttprequest-example.qml [moved from examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml with 100% similarity]
examples/qtquick/accessibility/accessibility.pro [new file with mode: 0644]
examples/qtquick/accessibility/accessibility.qml [moved from examples/declarative/accessibility/accessibility.qml with 91% similarity]
examples/qtquick/accessibility/accessibility.qmlproject [new file with mode: 0644]
examples/qtquick/accessibility/content/Button.qml [moved from examples/declarative/accessibility/widgets/Button.qml with 98% similarity]
examples/qtquick/accessibility/main.cpp [new file with mode: 0644]
examples/qtquick/animation/animation.pro [new file with mode: 0644]
examples/qtquick/animation/animation.qml [moved from examples/declarative/animation/animation.qml with 69% similarity]
examples/qtquick/animation/animation.qmlproject [moved from examples/declarative/animation/animation.qmlproject with 100% similarity]
examples/qtquick/animation/basics/color-animation.qml [moved from examples/declarative/animation/basics/color-animation.qml with 99% similarity]
examples/qtquick/animation/basics/images/face-smile.png [moved from examples/declarative/modelviews/parallax/content/pics/face-smile.png with 100% similarity]
examples/qtquick/animation/basics/images/moon.png [moved from examples/declarative/animation/basics/images/moon.png with 100% similarity]
examples/qtquick/animation/basics/images/shadow.png [moved from examples/declarative/modelviews/parallax/content/pics/shadow.png with 100% similarity]
examples/qtquick/animation/basics/images/star.png [moved from examples/declarative/animation/basics/images/star.png with 100% similarity]
examples/qtquick/animation/basics/images/sun.png [moved from examples/declarative/animation/basics/images/sun.png with 100% similarity]
examples/qtquick/animation/basics/property-animation.qml [moved from examples/declarative/animation/basics/property-animation.qml with 100% similarity]
examples/qtquick/animation/behaviors/SideRect.qml [moved from examples/declarative/animation/behaviors/SideRect.qml with 100% similarity]
examples/qtquick/animation/behaviors/behavior-example.qml [moved from examples/declarative/animation/behaviors/behavior-example.qml with 99% similarity]
examples/qtquick/animation/behaviors/wigglytext.qml [moved from examples/declarative/animation/behaviors/wigglytext.qml with 97% similarity]
examples/qtquick/animation/easing/content/QuitButton.qml [moved from examples/declarative/toys/clocks/content/QuitButton.qml with 100% similarity]
examples/qtquick/animation/easing/content/quit.png [moved from examples/declarative/minehunt/MinehuntCore/pics/quit.png with 100% similarity]
examples/qtquick/animation/easing/easing.qml [moved from examples/declarative/animation/easing/easing.qml with 93% similarity]
examples/qtquick/animation/main.cpp [new file with mode: 0644]
examples/qtquick/animation/pathanimation/pathanimation.qml [moved from examples/declarative/animation/pathanimation/pathanimation.qml with 76% similarity]
examples/qtquick/animation/pathinterpolator/pathinterpolator.qml [moved from examples/declarative/animation/pathinterpolator/pathinterpolator.qml with 87% similarity]
examples/qtquick/animation/states/qt-logo.png [moved from examples/declarative/keyinteraction/focus/Core/images/qt-logo.png with 100% similarity]
examples/qtquick/animation/states/states.qml [moved from examples/declarative/animation/states/states.qml with 100% similarity]
examples/qtquick/animation/states/transitions.qml [moved from examples/declarative/animation/states/transitions.qml with 100% similarity]
examples/qtquick/canvas/bezierCurve/bezierCurve.qml [moved from examples/declarative/canvas/bezierCurve/bezierCurve.qml with 100% similarity]
examples/qtquick/canvas/clip/clip.qml [moved from examples/declarative/canvas/clip/clip.qml with 100% similarity]
examples/qtquick/canvas/contents/Button.qml [moved from examples/declarative/canvas/contents/Button.qml with 100% similarity]
examples/qtquick/canvas/contents/ScrollBar.qml [moved from examples/declarative/canvas/contents/ScrollBar.qml with 100% similarity]
examples/qtquick/canvas/contents/Slider.qml [moved from examples/declarative/canvas/contents/Slider.qml with 100% similarity]
examples/qtquick/canvas/contents/Stocks.qml [moved from examples/declarative/canvas/contents/Stocks.qml with 100% similarity]
examples/qtquick/canvas/contents/TitleBar.qml [moved from examples/declarative/canvas/contents/TitleBar.qml with 100% similarity]
examples/qtquick/canvas/contents/ToolBar.qml [moved from examples/declarative/canvas/contents/ToolBar.qml with 100% similarity]
examples/qtquick/canvas/contents/images/button-pressed.png [moved from examples/declarative/canvas/contents/images/button-pressed.png with 100% similarity]
examples/qtquick/canvas/contents/images/button.png [moved from examples/declarative/canvas/contents/images/button.png with 100% similarity]
examples/qtquick/canvas/contents/images/default.svg [moved from examples/declarative/canvas/contents/images/default.svg with 100% similarity]
examples/qtquick/canvas/contents/images/gloss.png [moved from examples/declarative/canvas/contents/images/gloss.png with 100% similarity]
examples/qtquick/canvas/contents/images/lineedit.png [moved from examples/declarative/canvas/contents/images/lineedit.png with 100% similarity]
examples/qtquick/canvas/contents/images/lineedit.sci [moved from examples/declarative/canvas/contents/images/lineedit.sci with 100% similarity]
examples/qtquick/canvas/contents/images/quit.png [moved from examples/declarative/canvas/contents/images/quit.png with 100% similarity]
examples/qtquick/canvas/contents/images/stripes.png [moved from examples/declarative/canvas/contents/images/stripes.png with 100% similarity]
examples/qtquick/canvas/contents/images/titlebar.png [moved from examples/declarative/canvas/contents/images/titlebar.png with 100% similarity]
examples/qtquick/canvas/contents/images/titlebar.sci [moved from examples/declarative/canvas/contents/images/titlebar.sci with 100% similarity]
examples/qtquick/canvas/contents/images/toolbutton.png [moved from examples/declarative/canvas/contents/images/toolbutton.png with 100% similarity]
examples/qtquick/canvas/contents/images/toolbutton.sci [moved from examples/declarative/canvas/contents/images/toolbutton.sci with 100% similarity]
examples/qtquick/canvas/contents/qt-logo.png [moved from examples/declarative/canvas/contents/qt-logo.png with 100% similarity]
examples/qtquick/canvas/quadraticCurveTo/quadraticCurveTo.qml [moved from examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml with 100% similarity]
examples/qtquick/canvas/roundedrect/roundedrect.qml [moved from examples/declarative/canvas/roundedrect/roundedrect.qml with 100% similarity]
examples/qtquick/canvas/smile/smile.qml [moved from examples/declarative/canvas/smile/smile.qml with 100% similarity]
examples/qtquick/canvas/squircle/squircle.png [moved from examples/declarative/canvas/squircle/squircle.png with 100% similarity]
examples/qtquick/canvas/squircle/squircle.qml [moved from examples/declarative/canvas/squircle/squircle.qml with 100% similarity]
examples/qtquick/canvas/stockchart/README [moved from examples/declarative/canvas/stockchart/README with 100% similarity]
examples/qtquick/canvas/stockchart/com/nokia/StockChartExample/qmldir [moved from examples/declarative/canvas/stockchart/com/nokia/StockChartExample/qmldir with 100% similarity]
examples/qtquick/canvas/stockchart/model.cpp [moved from examples/declarative/canvas/stockchart/model.cpp with 100% similarity]
examples/qtquick/canvas/stockchart/model.h [moved from examples/declarative/canvas/stockchart/model.h with 100% similarity]
examples/qtquick/canvas/stockchart/plugin.cpp [moved from examples/declarative/canvas/stockchart/plugin.cpp with 100% similarity]
examples/qtquick/canvas/stockchart/stock.qml [moved from examples/declarative/canvas/stockchart/stock.qml with 100% similarity]
examples/qtquick/canvas/stockchart/stockchart.pro [moved from examples/declarative/canvas/stockchart/stockchart.pro with 100% similarity]
examples/qtquick/canvas/tiger/tiger.js [moved from examples/declarative/canvas/tiger/tiger.js with 100% similarity]
examples/qtquick/canvas/tiger/tiger.qml [moved from examples/declarative/canvas/tiger/tiger.qml with 100% similarity]
examples/qtquick/canvas/twitterfriends/TwitterUser.qml [moved from examples/declarative/canvas/twitterfriends/TwitterUser.qml with 100% similarity]
examples/qtquick/canvas/twitterfriends/cache.js [moved from examples/declarative/canvas/twitterfriends/cache.js with 100% similarity]
examples/qtquick/canvas/twitterfriends/twitter.qml [moved from examples/declarative/canvas/twitterfriends/twitter.qml with 100% similarity]
examples/qtquick/draganddrop/dragtarget.qmlproject [moved from examples/declarative/draganddrop/dragtarget.qmlproject with 100% similarity]
examples/qtquick/draganddrop/tiles/DragTile.qml [moved from examples/declarative/draganddrop/tiles/DragTile.qml with 100% similarity]
examples/qtquick/draganddrop/tiles/DropTile.qml [moved from examples/declarative/draganddrop/tiles/DropTile.qml with 100% similarity]
examples/qtquick/draganddrop/tiles/tiles.qml [moved from examples/declarative/draganddrop/tiles/tiles.qml with 100% similarity]
examples/qtquick/draganddrop/views/gridview.qml [moved from examples/declarative/draganddrop/views/gridview.qml with 100% similarity]
examples/qtquick/imageelements/borderimage.qml [new file with mode: 0644]
examples/qtquick/imageelements/content/BearSheet.png [moved from examples/declarative/imageelements/content/BearSheet.png with 100% similarity]
examples/qtquick/imageelements/content/ImageCell.qml [moved from examples/declarative/imageelements/content/ImageCell.qml with 100% similarity]
examples/qtquick/imageelements/content/MyBorderImage.qml [moved from examples/declarative/imageelements/content/MyBorderImage.qml with 100% similarity]
examples/qtquick/imageelements/content/ShadowRectangle.qml [moved from examples/declarative/imageelements/content/ShadowRectangle.qml with 100% similarity]
examples/qtquick/imageelements/content/bw.png [moved from examples/declarative/imageelements/content/bw.png with 100% similarity]
examples/qtquick/imageelements/content/colors-round.sci [moved from examples/declarative/imageelements/content/colors-round.sci with 100% similarity]
examples/qtquick/imageelements/content/colors-stretch.sci [moved from examples/declarative/imageelements/content/colors-stretch.sci with 100% similarity]
examples/qtquick/imageelements/content/colors.png [moved from examples/declarative/imageelements/content/colors.png with 100% similarity]
examples/qtquick/imageelements/content/qt-logo.png [moved from examples/declarative/imageelements/content/qt-logo.png with 100% similarity]
examples/qtquick/imageelements/content/shadow.png [moved from examples/declarative/imageelements/content/shadow.png with 100% similarity]
examples/qtquick/imageelements/content/speaker.png [moved from examples/declarative/imageelements/content/speaker.png with 100% similarity]
examples/qtquick/imageelements/image.qml [new file with mode: 0644]
examples/qtquick/imageelements/imageelements.qml [moved from examples/declarative/imageelements/imageelements.qml with 99% similarity]
examples/qtquick/imageelements/imageelements.qmlproject [moved from examples/declarative/imageelements/imageelements.qmlproject with 100% similarity]
examples/qtquick/imageelements/shadows.qml [moved from examples/declarative/imageelements/shadows.qml with 100% similarity]
examples/qtquick/imageelements/simplesprite.qml [moved from examples/declarative/imageelements/simplesprite.qml with 100% similarity]
examples/qtquick/imageelements/spriteimage.qml [moved from examples/declarative/imageelements/spriteimage.qml with 100% similarity]
examples/qtquick/keyinteraction/focus/Core/ContextMenu.qml [moved from examples/declarative/keyinteraction/focus/Core/ContextMenu.qml with 100% similarity]
examples/qtquick/keyinteraction/focus/Core/GridMenu.qml [moved from examples/declarative/keyinteraction/focus/Core/GridMenu.qml with 100% similarity]
examples/qtquick/keyinteraction/focus/Core/ListMenu.qml [moved from examples/declarative/keyinteraction/focus/Core/ListMenu.qml with 100% similarity]
examples/qtquick/keyinteraction/focus/Core/ListViewDelegate.qml [moved from examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml with 100% similarity]
examples/qtquick/keyinteraction/focus/Core/images/arrow.png [moved from examples/declarative/keyinteraction/focus/Core/images/arrow.png with 100% similarity]
examples/qtquick/keyinteraction/focus/Core/images/qt-logo.png [moved from examples/declarative/animation/states/qt-logo.png with 100% similarity]
examples/qtquick/keyinteraction/focus/focus.qml [moved from examples/declarative/keyinteraction/focus/focus.qml with 100% similarity]
examples/qtquick/modelviews/abstractitemmodel/abstractitemmodel.pro [moved from examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro with 100% similarity]
examples/qtquick/modelviews/abstractitemmodel/abstractitemmodel.qrc [moved from examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc with 100% similarity]
examples/qtquick/modelviews/abstractitemmodel/main.cpp [moved from examples/declarative/modelviews/abstractitemmodel/main.cpp with 100% similarity]
examples/qtquick/modelviews/abstractitemmodel/model.cpp [moved from examples/declarative/modelviews/abstractitemmodel/model.cpp with 100% similarity]
examples/qtquick/modelviews/abstractitemmodel/model.h [moved from examples/declarative/modelviews/abstractitemmodel/model.h with 100% similarity]
examples/qtquick/modelviews/abstractitemmodel/view.qml [moved from examples/declarative/modelviews/abstractitemmodel/view.qml with 100% similarity]
examples/qtquick/modelviews/gridview/gridview-example.qml [moved from examples/declarative/modelviews/gridview/gridview-example.qml with 100% similarity]
examples/qtquick/modelviews/gridview/pics/AddressBook_48.png [moved from examples/declarative/modelviews/pathview/pics/AddressBook_48.png with 100% similarity]
examples/qtquick/modelviews/gridview/pics/AudioPlayer_48.png [moved from examples/declarative/modelviews/pathview/pics/AudioPlayer_48.png with 100% similarity]
examples/qtquick/modelviews/gridview/pics/Camera_48.png [moved from examples/declarative/modelviews/pathview/pics/Camera_48.png with 100% similarity]
examples/qtquick/modelviews/gridview/pics/DateBook_48.png [moved from examples/declarative/modelviews/pathview/pics/DateBook_48.png with 100% similarity]
examples/qtquick/modelviews/gridview/pics/EMail_48.png [moved from examples/declarative/modelviews/pathview/pics/EMail_48.png with 100% similarity]
examples/qtquick/modelviews/gridview/pics/TodoList_48.png [moved from examples/declarative/modelviews/pathview/pics/TodoList_48.png with 100% similarity]
examples/qtquick/modelviews/gridview/pics/VideoPlayer_48.png [moved from examples/declarative/modelviews/pathview/pics/VideoPlayer_48.png with 100% similarity]
examples/qtquick/modelviews/listview/content/PetsModel.qml [moved from examples/declarative/tutorials/dynamicview/dynamicview4/PetsModel.qml with 100% similarity]
examples/qtquick/modelviews/listview/content/PressAndHoldButton.qml [moved from examples/declarative/modelviews/listview/content/PressAndHoldButton.qml with 100% similarity]
examples/qtquick/modelviews/listview/content/RecipesModel.qml [moved from examples/declarative/modelviews/listview/content/RecipesModel.qml with 100% similarity]
examples/qtquick/modelviews/listview/content/TextButton.qml [moved from examples/declarative/modelviews/listview/content/TextButton.qml with 100% similarity]
examples/qtquick/modelviews/listview/content/ToggleButton.qml [moved from examples/declarative/modelviews/listview/content/ToggleButton.qml with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/arrow-down.png [moved from examples/declarative/modelviews/listview/content/pics/arrow-down.png with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/arrow-up.png [moved from examples/declarative/modelviews/listview/content/pics/arrow-up.png with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/fruit-salad.jpg [moved from examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/hamburger.jpg [moved from examples/declarative/modelviews/listview/content/pics/hamburger.jpg with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/lemonade.jpg [moved from examples/declarative/modelviews/listview/content/pics/lemonade.jpg with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/list-delete.png [moved from examples/declarative/modelviews/listview/content/pics/list-delete.png with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/minus-sign.png [moved from examples/declarative/modelviews/listview/content/pics/minus-sign.png with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/moreDown.png [moved from examples/declarative/modelviews/listview/content/pics/moreDown.png with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/moreUp.png [moved from examples/declarative/modelviews/listview/content/pics/moreUp.png with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/pancakes.jpg [moved from examples/declarative/modelviews/listview/content/pics/pancakes.jpg with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/plus-sign.png [moved from examples/declarative/modelviews/listview/content/pics/plus-sign.png with 100% similarity]
examples/qtquick/modelviews/listview/content/pics/vegetable-soup.jpg [moved from examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg with 100% similarity]
examples/qtquick/modelviews/listview/dynamiclist.qml [moved from examples/declarative/modelviews/listview/dynamiclist.qml with 100% similarity]
examples/qtquick/modelviews/listview/expandingdelegates.qml [moved from examples/declarative/modelviews/listview/expandingdelegates.qml with 100% similarity]
examples/qtquick/modelviews/listview/highlight.qml [moved from examples/declarative/modelviews/listview/highlight.qml with 100% similarity]
examples/qtquick/modelviews/listview/highlightranges.qml [moved from examples/declarative/modelviews/listview/highlightranges.qml with 100% similarity]
examples/qtquick/modelviews/listview/sections.qml [moved from examples/declarative/modelviews/listview/sections.qml with 100% similarity]
examples/qtquick/modelviews/modelviews.pro [moved from examples/declarative/modelviews/modelviews.pro with 100% similarity]
examples/qtquick/modelviews/modelviews.qml [moved from examples/declarative/modelviews/modelviews.qml with 99% similarity]
examples/qtquick/modelviews/modelviews.qmlproject [moved from examples/declarative/modelviews/modelviews.qmlproject with 100% similarity]
examples/qtquick/modelviews/objectlistmodel/dataobject.cpp [moved from examples/declarative/modelviews/objectlistmodel/dataobject.cpp with 100% similarity]
examples/qtquick/modelviews/objectlistmodel/dataobject.h [moved from examples/declarative/modelviews/objectlistmodel/dataobject.h with 100% similarity]
examples/qtquick/modelviews/objectlistmodel/main.cpp [moved from examples/declarative/modelviews/objectlistmodel/main.cpp with 100% similarity]
examples/qtquick/modelviews/objectlistmodel/objectlistmodel.pro [moved from examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro with 100% similarity]
examples/qtquick/modelviews/objectlistmodel/objectlistmodel.qmlproject [moved from examples/declarative/modelviews/objectlistmodel/objectlistmodel.qmlproject with 100% similarity]
examples/qtquick/modelviews/objectlistmodel/objectlistmodel.qrc [moved from examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc with 100% similarity]
examples/qtquick/modelviews/objectlistmodel/view.qml [moved from examples/declarative/modelviews/objectlistmodel/view.qml with 100% similarity]
examples/qtquick/modelviews/package/Delegate.qml [moved from examples/declarative/modelviews/package/Delegate.qml with 100% similarity]
examples/qtquick/modelviews/package/view.qml [moved from examples/declarative/modelviews/package/view.qml with 96% similarity]
examples/qtquick/modelviews/parallax/content/Clock.qml [new file with mode: 0644]
examples/qtquick/modelviews/parallax/content/ParallaxView.qml [moved from examples/declarative/modelviews/parallax/content/ParallaxView.qml with 100% similarity]
examples/qtquick/modelviews/parallax/content/QuitButton.qml [moved from examples/declarative/animation/easing/content/QuitButton.qml with 100% similarity]
examples/qtquick/modelviews/parallax/content/Smiley.qml [moved from examples/declarative/modelviews/parallax/content/Smiley.qml with 100% similarity]
examples/qtquick/modelviews/parallax/content/background.png [new file with mode: 0644]
examples/qtquick/modelviews/parallax/content/center.png [new file with mode: 0644]
examples/qtquick/modelviews/parallax/content/clock-night.png [new file with mode: 0644]
examples/qtquick/modelviews/parallax/content/clock.png [new file with mode: 0644]
examples/qtquick/modelviews/parallax/content/hour.png [new file with mode: 0644]
examples/qtquick/modelviews/parallax/content/minute.png [new file with mode: 0644]
examples/qtquick/modelviews/parallax/content/pics/background.jpg [moved from examples/declarative/modelviews/parallax/content/pics/background.jpg with 100% similarity]
examples/qtquick/modelviews/parallax/content/pics/face-smile.png [moved from examples/declarative/minehunt/MinehuntCore/pics/face-smile.png with 100% similarity]
examples/qtquick/modelviews/parallax/content/pics/home-page.png [moved from examples/declarative/modelviews/parallax/content/pics/home-page.png with 100% similarity]
examples/qtquick/modelviews/parallax/content/pics/home-page.svg [moved from examples/declarative/modelviews/parallax/content/pics/home-page.svg with 100% similarity]
examples/qtquick/modelviews/parallax/content/pics/shadow.png [moved from examples/declarative/animation/basics/images/shadow.png with 100% similarity]
examples/qtquick/modelviews/parallax/content/pics/yast-joystick.png [moved from examples/declarative/modelviews/parallax/content/pics/yast-joystick.png with 100% similarity]
examples/qtquick/modelviews/parallax/content/pics/yast-wol.png [moved from examples/declarative/modelviews/parallax/content/pics/yast-wol.png with 100% similarity]
examples/qtquick/modelviews/parallax/content/quit.png [moved from examples/declarative/animation/easing/content/quit.png with 100% similarity]
examples/qtquick/modelviews/parallax/content/second.png [new file with mode: 0644]
examples/qtquick/modelviews/parallax/parallax.qml [moved from examples/declarative/modelviews/parallax/parallax.qml with 97% similarity]
examples/qtquick/modelviews/pathview/pathview-example.qml [moved from examples/declarative/modelviews/pathview/pathview-example.qml with 100% similarity]
examples/qtquick/modelviews/pathview/pics/AddressBook_48.png [moved from examples/declarative/modelviews/gridview/pics/AddressBook_48.png with 100% similarity]
examples/qtquick/modelviews/pathview/pics/AudioPlayer_48.png [moved from examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png with 100% similarity]
examples/qtquick/modelviews/pathview/pics/Camera_48.png [moved from examples/declarative/modelviews/gridview/pics/Camera_48.png with 100% similarity]
examples/qtquick/modelviews/pathview/pics/DateBook_48.png [moved from examples/declarative/modelviews/gridview/pics/DateBook_48.png with 100% similarity]
examples/qtquick/modelviews/pathview/pics/EMail_48.png [moved from examples/declarative/modelviews/gridview/pics/EMail_48.png with 100% similarity]
examples/qtquick/modelviews/pathview/pics/TodoList_48.png [moved from examples/declarative/modelviews/gridview/pics/TodoList_48.png with 100% similarity]
examples/qtquick/modelviews/pathview/pics/VideoPlayer_48.png [moved from examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png with 100% similarity]
examples/qtquick/modelviews/stringlistmodel/main.cpp [moved from examples/declarative/modelviews/stringlistmodel/main.cpp with 100% similarity]
examples/qtquick/modelviews/stringlistmodel/stringlistmodel.pro [moved from examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro with 100% similarity]
examples/qtquick/modelviews/stringlistmodel/stringlistmodel.qrc [moved from examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc with 100% similarity]
examples/qtquick/modelviews/stringlistmodel/view.qml [moved from examples/declarative/modelviews/stringlistmodel/view.qml with 100% similarity]
examples/qtquick/modelviews/visualdatamodel/dragselection.qml [moved from examples/declarative/modelviews/visualdatamodel/dragselection.qml with 100% similarity]
examples/qtquick/modelviews/visualdatamodel/slideshow.qml [moved from examples/declarative/modelviews/visualdatamodel/slideshow.qml with 100% similarity]
examples/qtquick/modelviews/visualdatamodel/sortedmodel.qml [moved from examples/declarative/modelviews/visualdatamodel/sortedmodel.qml with 100% similarity]
examples/qtquick/modelviews/visualdatamodel/visualdatamodel.qmlproject [moved from examples/declarative/modelviews/visualdatamodel/visualdatamodel.qmlproject with 100% similarity]
examples/qtquick/modelviews/visualitemmodel/visualitemmodel.qml [moved from examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml with 98% similarity]
examples/qtquick/mousearea/mousearea-example.qml [moved from examples/declarative/touchinteraction/mousearea/mousearea-example.qml with 100% similarity]
examples/qtquick/openglunderqml/main.cpp [moved from examples/declarative/openglunderqml/main.cpp with 100% similarity]
examples/qtquick/openglunderqml/main.qml [moved from examples/declarative/openglunderqml/main.qml with 100% similarity]
examples/qtquick/openglunderqml/openglunderqml.pro [moved from examples/declarative/openglunderqml/openglunderqml.pro with 100% similarity]
examples/qtquick/openglunderqml/squircle.cpp [moved from examples/declarative/openglunderqml/squircle.cpp with 100% similarity]
examples/qtquick/openglunderqml/squircle.h [moved from examples/declarative/openglunderqml/squircle.h with 100% similarity]
examples/qtquick/painteditem/painteditem.pro [moved from examples/declarative/painteditem/painteditem.pro with 100% similarity]
examples/qtquick/painteditem/smile/main.cpp [moved from examples/declarative/painteditem/smile/main.cpp with 100% similarity]
examples/qtquick/painteditem/smile/smile.pro [moved from examples/declarative/painteditem/smile/smile.pro with 100% similarity]
examples/qtquick/painteditem/smile/smile.qml [moved from examples/declarative/painteditem/smile/smile.qml with 100% similarity]
examples/qtquick/painteditem/textballoons/TextBalloonPlugin/plugin.h [moved from examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h with 100% similarity]
examples/qtquick/painteditem/textballoons/TextBalloonPlugin/qmldir [moved from examples/declarative/painteditem/textballoons/TextBalloonPlugin/qmldir with 100% similarity]
examples/qtquick/painteditem/textballoons/textballoon.cpp [moved from examples/declarative/painteditem/textballoons/textballoon.cpp with 100% similarity]
examples/qtquick/painteditem/textballoons/textballoon.h [moved from examples/declarative/painteditem/textballoons/textballoon.h with 100% similarity]
examples/qtquick/painteditem/textballoons/textballoons.pro [moved from examples/declarative/painteditem/textballoons/textballoons.pro with 100% similarity]
examples/qtquick/painteditem/textballoons/textballoons.qml [moved from examples/declarative/painteditem/textballoons/textballoons.qml with 100% similarity]
examples/qtquick/positioners/content/Button.qml [moved from examples/declarative/positioners/content/Button.qml with 100% similarity]
examples/qtquick/positioners/content/add.png [moved from examples/declarative/positioners/content/add.png with 100% similarity]
examples/qtquick/positioners/content/del.png [moved from examples/declarative/positioners/content/del.png with 100% similarity]
examples/qtquick/positioners/positioners-attachedproperties.qml [moved from examples/declarative/positioners/positioners-attachedproperties.qml with 100% similarity]
examples/qtquick/positioners/positioners.qml [moved from examples/declarative/positioners/positioners.qml with 98% similarity]
examples/qtquick/qtquick.pro [new file with mode: 0644]
examples/qtquick/righttoleft/layoutdirection/layoutdirection.qml [moved from examples/declarative/righttoleft/layoutdirection/layoutdirection.qml with 100% similarity]
examples/qtquick/righttoleft/layoutdirection/layoutdirection.qmlproject [moved from examples/declarative/righttoleft/layoutdirection/layoutdirection.qmlproject with 100% similarity]
examples/qtquick/righttoleft/layoutmirroring/layoutmirroring.qml [moved from examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml with 100% similarity]
examples/qtquick/righttoleft/layoutmirroring/layoutmirroring.qmlproject [moved from examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qmlproject with 100% similarity]
examples/qtquick/righttoleft/textalignment/textalignment.qml [moved from examples/declarative/righttoleft/textalignment/textalignment.qml with 100% similarity]
examples/qtquick/righttoleft/textalignment/textalignment.qmlproject [moved from examples/declarative/righttoleft/textalignment/textalignment.qmlproject with 100% similarity]
examples/qtquick/shadereffects/content/Slider.qml [moved from examples/declarative/shadereffects/content/Slider.qml with 100% similarity]
examples/qtquick/shadereffects/content/face-smile.png [moved from examples/declarative/animation/basics/images/face-smile.png with 100% similarity]
examples/qtquick/shadereffects/content/qt-logo.png [moved from examples/declarative/shadereffects/content/qt-logo.png with 100% similarity]
examples/qtquick/shadereffects/shadereffects.qml [new file with mode: 0644]
examples/qtquick/text/fonts/availableFonts.qml [moved from examples/declarative/text/fonts/availableFonts.qml with 100% similarity]
examples/qtquick/text/fonts/banner.qml [moved from examples/declarative/text/fonts/banner.qml with 100% similarity]
examples/qtquick/text/fonts/content/fonts/tarzeau_ocr_a.ttf [moved from examples/declarative/text/fonts/content/fonts/tarzeau_ocr_a.ttf with 100% similarity]
examples/qtquick/text/fonts/fonts.qml [moved from examples/declarative/text/fonts/fonts.qml with 100% similarity]
examples/qtquick/text/fonts/hello.qml [moved from examples/declarative/text/fonts/hello.qml with 100% similarity]
examples/qtquick/text/imgtag/TextWithImage.qml [moved from examples/declarative/text/imgtag/TextWithImage.qml with 100% similarity]
examples/qtquick/text/imgtag/images/face-sad.png [moved from examples/declarative/text/imgtag/images/face-sad.png with 100% similarity]
examples/qtquick/text/imgtag/images/face-smile-big.png [moved from examples/declarative/text/imgtag/images/face-smile-big.png with 100% similarity]
examples/qtquick/text/imgtag/images/face-smile.png [moved from examples/declarative/text/imgtag/images/face-smile.png with 100% similarity]
examples/qtquick/text/imgtag/images/heart200.png [moved from examples/declarative/text/imgtag/images/heart200.png with 100% similarity]
examples/qtquick/text/imgtag/images/qtlogo.png [moved from examples/declarative/text/imgtag/images/qtlogo.png with 100% similarity]
examples/qtquick/text/imgtag/images/starfish_2.png [moved from examples/declarative/text/imgtag/images/starfish_2.png with 100% similarity]
examples/qtquick/text/imgtag/imgtag.qml [moved from examples/declarative/text/imgtag/imgtag.qml with 100% similarity]
examples/qtquick/text/styledtext-layout.qml [moved from examples/declarative/text/styledtext-layout.qml with 100% similarity]
examples/qtquick/text/text.qml [moved from examples/declarative/text/text.qml with 99% similarity]
examples/qtquick/text/text.qmlproject [moved from examples/declarative/text/text.qmlproject with 100% similarity]
examples/qtquick/text/textselection/pics/endHandle.png [moved from examples/declarative/text/textselection/pics/endHandle.png with 100% similarity]
examples/qtquick/text/textselection/pics/endHandle.sci [moved from examples/declarative/text/textselection/pics/endHandle.sci with 100% similarity]
examples/qtquick/text/textselection/pics/startHandle.png [moved from examples/declarative/text/textselection/pics/startHandle.png with 100% similarity]
examples/qtquick/text/textselection/pics/startHandle.sci [moved from examples/declarative/text/textselection/pics/startHandle.sci with 100% similarity]
examples/qtquick/text/textselection/textselection.qml [moved from examples/declarative/text/textselection/textselection.qml with 100% similarity]
examples/qtquick/threading/threadedlistmodel/dataloader.js [moved from examples/declarative/threading/threadedlistmodel/dataloader.js with 100% similarity]
examples/qtquick/threading/threadedlistmodel/threadedlistmodel.qmlproject [moved from examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject with 100% similarity]
examples/qtquick/threading/threadedlistmodel/timedisplay.qml [moved from examples/declarative/threading/threadedlistmodel/timedisplay.qml with 100% similarity]
examples/qtquick/threading/workerscript/workerscript.js [moved from examples/declarative/threading/workerscript/workerscript.js with 100% similarity]
examples/qtquick/threading/workerscript/workerscript.qml [moved from examples/declarative/threading/workerscript/workerscript.qml with 100% similarity]
examples/qtquick/threading/workerscript/workerscript.qmlproject [moved from examples/declarative/threading/workerscript/workerscript.qmlproject with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/bearwhack.qml [moved from examples/declarative/touchinteraction/multipointtouch/bearwhack.qml with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml [moved from examples/declarative/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/Bear0.png [moved from examples/declarative/touchinteraction/multipointtouch/content/Bear0.png with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/Bear1.png [moved from examples/declarative/touchinteraction/multipointtouch/content/Bear1.png with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/Bear2.png [moved from examples/declarative/touchinteraction/multipointtouch/content/Bear2.png with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/Bear3.png [moved from examples/declarative/touchinteraction/multipointtouch/content/Bear3.png with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/BearB.png [moved from examples/declarative/touchinteraction/multipointtouch/content/BearB.png with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml [moved from examples/declarative/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/ParticleFlame.qml [moved from examples/declarative/touchinteraction/multipointtouch/content/ParticleFlame.qml with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/blur-circle.png [moved from examples/declarative/touchinteraction/multipointtouch/content/blur-circle.png with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/blur-circle3.png [moved from examples/declarative/particles/plasmapatrol/content/pics/blur-circle3.png with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/heart-blur.png [moved from examples/declarative/touchinteraction/multipointtouch/content/heart-blur.png with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/content/title.png [moved from examples/declarative/touchinteraction/multipointtouch/content/title.png with 100% similarity]
examples/qtquick/touchinteraction/multipointtouch/multiflame.qml [moved from examples/declarative/touchinteraction/multipointtouch/multiflame.qml with 100% similarity]
examples/qtquick/touchinteraction/pincharea/flickresize.qml [moved from examples/declarative/touchinteraction/pincharea/flickresize.qml with 100% similarity]
examples/qtquick/touchinteraction/pincharea/qt-logo.jpg [moved from examples/declarative/touchinteraction/pincharea/qt-logo.jpg with 100% similarity]
examples/qtquick/touchinteraction/touchinteraction.qml [moved from examples/declarative/touchinteraction/touchinteraction.qml with 94% similarity]
examples/qtquick/touchinteraction/touchinteraction.qmlproject [moved from examples/declarative/touchinteraction/touchinteraction.qmlproject with 100% similarity]
examples/shared/Button.qml [moved from examples/declarative/shared/Button.qml with 100% similarity]
examples/shared/LauncherList.qml [moved from examples/declarative/shared/LauncherList.qml with 97% similarity]
examples/shared/README [moved from examples/declarative/shared/README with 100% similarity]
examples/shared/SimpleLauncherDelegate.qml [moved from examples/declarative/shared/SimpleLauncherDelegate.qml with 100% similarity]
examples/shared/images/back.png [moved from examples/declarative/shared/back.png with 100% similarity]
examples/shared/qmldir [new file with mode: 0644]
examples/shared/shared.h [new file with mode: 0644]
examples/shared/shared.pro [new file with mode: 0644]
examples/tutorials/dynamicview/dynamicview1/PetsModel.qml [moved from examples/declarative/tutorials/dynamicview/dynamicview1/PetsModel.qml with 100% similarity]
examples/tutorials/dynamicview/dynamicview1/dynamicview.qml [moved from examples/declarative/tutorials/dynamicview/dynamicview1/dynamicview.qml with 100% similarity]
examples/tutorials/dynamicview/dynamicview2/PetsModel.qml [moved from examples/declarative/tutorials/dynamicview/dynamicview3/PetsModel.qml with 100% similarity]
examples/tutorials/dynamicview/dynamicview2/dynamicview.qml [moved from examples/declarative/tutorials/dynamicview/dynamicview2/dynamicview.qml with 100% similarity]
examples/tutorials/dynamicview/dynamicview3/PetsModel.qml [moved from examples/declarative/tutorials/dynamicview/dynamicview2/PetsModel.qml with 100% similarity]
examples/tutorials/dynamicview/dynamicview3/dynamicview.qml [moved from examples/declarative/tutorials/dynamicview/dynamicview3/dynamicview.qml with 100% similarity]
examples/tutorials/dynamicview/dynamicview4/ListSelector.qml [moved from examples/declarative/tutorials/dynamicview/dynamicview4/ListSelector.qml with 100% similarity]
examples/tutorials/dynamicview/dynamicview4/PetsModel.qml [moved from examples/declarative/modelviews/listview/content/PetsModel.qml with 100% similarity]
examples/tutorials/dynamicview/dynamicview4/dynamicview.qml [moved from examples/declarative/tutorials/dynamicview/dynamicview4/dynamicview.qml with 100% similarity]
examples/tutorials/extending/chapter1-basics/app.qml [moved from examples/declarative/tutorials/extending/chapter1-basics/app.qml with 100% similarity]
examples/tutorials/extending/chapter1-basics/chapter1-basics.pro [moved from examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro with 100% similarity]
examples/tutorials/extending/chapter1-basics/main.cpp [moved from examples/declarative/tutorials/extending/chapter3-bindings/main.cpp with 100% similarity]
examples/tutorials/extending/chapter1-basics/piechart.cpp [moved from examples/declarative/tutorials/extending/chapter1-basics/piechart.cpp with 100% similarity]
examples/tutorials/extending/chapter1-basics/piechart.h [moved from examples/declarative/tutorials/extending/chapter1-basics/piechart.h with 100% similarity]
examples/tutorials/extending/chapter2-methods/app.qml [moved from examples/declarative/tutorials/extending/chapter2-methods/app.qml with 100% similarity]
examples/tutorials/extending/chapter2-methods/chapter2-methods.pro [moved from examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro with 100% similarity]
examples/tutorials/extending/chapter2-methods/main.cpp [moved from examples/declarative/tutorials/extending/chapter2-methods/main.cpp with 100% similarity]
examples/tutorials/extending/chapter2-methods/piechart.cpp [moved from examples/declarative/tutorials/extending/chapter2-methods/piechart.cpp with 100% similarity]
examples/tutorials/extending/chapter2-methods/piechart.h [moved from examples/declarative/tutorials/extending/chapter2-methods/piechart.h with 100% similarity]
examples/tutorials/extending/chapter3-bindings/app.qml [moved from examples/declarative/tutorials/extending/chapter3-bindings/app.qml with 100% similarity]
examples/tutorials/extending/chapter3-bindings/chapter3-bindings.pro [moved from examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro with 100% similarity]
examples/tutorials/extending/chapter3-bindings/main.cpp [moved from examples/declarative/tutorials/extending/chapter1-basics/main.cpp with 100% similarity]
examples/tutorials/extending/chapter3-bindings/piechart.cpp [moved from examples/declarative/tutorials/extending/chapter3-bindings/piechart.cpp with 100% similarity]
examples/tutorials/extending/chapter3-bindings/piechart.h [moved from examples/declarative/tutorials/extending/chapter3-bindings/piechart.h with 100% similarity]
examples/tutorials/extending/chapter4-customPropertyTypes/app.qml [moved from examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml with 100% similarity]
examples/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro [moved from examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro with 100% similarity]
examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp [moved from examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp with 100% similarity]
examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp [moved from examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp with 100% similarity]
examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h [moved from examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h with 100% similarity]
examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp [moved from examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp with 100% similarity]
examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h [moved from examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h with 100% similarity]
examples/tutorials/extending/chapter5-listproperties/app.qml [moved from examples/declarative/tutorials/extending/chapter5-listproperties/app.qml with 100% similarity]
examples/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro [moved from examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro with 100% similarity]
examples/tutorials/extending/chapter5-listproperties/main.cpp [moved from examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp with 100% similarity]
examples/tutorials/extending/chapter5-listproperties/piechart.cpp [moved from examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp with 100% similarity]
examples/tutorials/extending/chapter5-listproperties/piechart.h [moved from examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h with 100% similarity]
examples/tutorials/extending/chapter5-listproperties/pieslice.cpp [moved from examples/declarative/tutorials/extending/chapter6-plugins/pieslice.cpp with 100% similarity]
examples/tutorials/extending/chapter5-listproperties/pieslice.h [moved from examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h with 100% similarity]
examples/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir [moved from examples/declarative/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir with 100% similarity]
examples/tutorials/extending/chapter6-plugins/app.qml [moved from examples/declarative/tutorials/extending/chapter6-plugins/app.qml with 100% similarity]
examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro [moved from examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro with 100% similarity]
examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp [moved from examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp with 100% similarity]
examples/tutorials/extending/chapter6-plugins/chartsplugin.h [moved from examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h with 100% similarity]
examples/tutorials/extending/chapter6-plugins/piechart.cpp [moved from examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp with 100% similarity]
examples/tutorials/extending/chapter6-plugins/piechart.h [moved from examples/declarative/tutorials/extending/chapter6-plugins/piechart.h with 100% similarity]
examples/tutorials/extending/chapter6-plugins/pieslice.cpp [moved from examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.cpp with 100% similarity]
examples/tutorials/extending/chapter6-plugins/pieslice.h [moved from examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h with 100% similarity]
examples/tutorials/extending/extending.pro [moved from examples/declarative/tutorials/extending/extending.pro with 100% similarity]
examples/tutorials/helloworld/Cell.qml [moved from examples/declarative/tutorials/helloworld/Cell.qml with 100% similarity]
examples/tutorials/helloworld/tutorial1.qml [moved from examples/declarative/tutorials/helloworld/tutorial1.qml with 100% similarity]
examples/tutorials/helloworld/tutorial2.qml [moved from examples/declarative/tutorials/helloworld/tutorial2.qml with 100% similarity]
examples/tutorials/helloworld/tutorial3.qml [moved from examples/declarative/tutorials/helloworld/tutorial3.qml with 100% similarity]
examples/tutorials/samegame/samegame1/Block.qml [moved from examples/declarative/tutorials/samegame/samegame1/Block.qml with 100% similarity]
examples/tutorials/samegame/samegame1/Button.qml [moved from examples/declarative/tutorials/samegame/samegame1/Button.qml with 100% similarity]
examples/tutorials/samegame/samegame1/samegame.qml [moved from examples/declarative/tutorials/samegame/samegame1/samegame.qml with 100% similarity]
examples/tutorials/samegame/samegame1/samegame1.qmlproject [moved from examples/declarative/tutorials/samegame/samegame1/samegame1.qmlproject with 100% similarity]
examples/tutorials/samegame/samegame2/Block.qml [moved from examples/declarative/tutorials/samegame/samegame2/Block.qml with 100% similarity]
examples/tutorials/samegame/samegame2/Button.qml [moved from examples/declarative/tutorials/samegame/samegame4/content/Button.qml with 100% similarity]
examples/tutorials/samegame/samegame2/samegame.js [moved from examples/declarative/tutorials/samegame/samegame2/samegame.js with 100% similarity]
examples/tutorials/samegame/samegame2/samegame.qml [moved from examples/declarative/tutorials/samegame/samegame2/samegame.qml with 100% similarity]
examples/tutorials/samegame/samegame2/samegame2.qmlproject [moved from examples/declarative/tutorials/samegame/samegame2/samegame2.qmlproject with 100% similarity]
examples/tutorials/samegame/samegame3/Block.qml [moved from examples/declarative/tutorials/samegame/samegame3/Block.qml with 100% similarity]
examples/tutorials/samegame/samegame3/Button.qml [moved from examples/declarative/tutorials/samegame/samegame3/Button.qml with 100% similarity]
examples/tutorials/samegame/samegame3/Dialog.qml [moved from examples/declarative/tutorials/samegame/samegame3/Dialog.qml with 100% similarity]
examples/tutorials/samegame/samegame3/samegame.js [moved from examples/declarative/tutorials/samegame/samegame3/samegame.js with 100% similarity]
examples/tutorials/samegame/samegame3/samegame.qml [moved from examples/declarative/tutorials/samegame/samegame3/samegame.qml with 100% similarity]
examples/tutorials/samegame/samegame3/samegame3.qmlproject [moved from examples/declarative/tutorials/samegame/samegame3/samegame3.qmlproject with 100% similarity]
examples/tutorials/samegame/samegame4/content/BoomBlock.qml [moved from examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml with 100% similarity]
examples/tutorials/samegame/samegame4/content/Button.qml [moved from examples/declarative/tutorials/samegame/samegame2/Button.qml with 100% similarity]
examples/tutorials/samegame/samegame4/content/Dialog.qml [moved from examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml with 100% similarity]
examples/tutorials/samegame/samegame4/content/samegame.js [moved from examples/declarative/tutorials/samegame/samegame4/content/samegame.js with 100% similarity]
examples/tutorials/samegame/samegame4/highscores/README [moved from examples/declarative/tutorials/samegame/samegame4/highscores/README with 100% similarity]
examples/tutorials/samegame/samegame4/highscores/score_data.xml [moved from examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml with 100% similarity]
examples/tutorials/samegame/samegame4/highscores/score_style.xsl [moved from examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl with 100% similarity]
examples/tutorials/samegame/samegame4/highscores/scores.php [moved from examples/declarative/tutorials/samegame/samegame4/highscores/scores.php with 100% similarity]
examples/tutorials/samegame/samegame4/samegame.qml [moved from examples/declarative/tutorials/samegame/samegame4/samegame.qml with 100% similarity]
examples/tutorials/samegame/samegame4/samegame4.qmlproject [moved from examples/declarative/tutorials/samegame/samegame4/samegame4.qmlproject with 100% similarity]
examples/tutorials/samegame/shared/pics/background.jpg [moved from examples/declarative/tutorials/samegame/shared/pics/background.jpg with 100% similarity]
examples/tutorials/samegame/shared/pics/blueStar.png [moved from examples/declarative/tutorials/samegame/shared/pics/blueStar.png with 100% similarity]
examples/tutorials/samegame/shared/pics/blueStone.png [moved from examples/declarative/samegame/content/pics/blueStone.png with 100% similarity]
examples/tutorials/samegame/shared/pics/greenStar.png [moved from examples/declarative/tutorials/samegame/shared/pics/greenStar.png with 100% similarity]
examples/tutorials/samegame/shared/pics/greenStone.png [moved from examples/declarative/samegame/content/pics/greenStone.png with 100% similarity]
examples/tutorials/samegame/shared/pics/redStar.png [moved from examples/declarative/tutorials/samegame/shared/pics/redStar.png with 100% similarity]
examples/tutorials/samegame/shared/pics/redStone.png [moved from examples/declarative/samegame/content/pics/redStone.png with 100% similarity]
examples/tutorials/samegame/shared/pics/star.png [moved from examples/declarative/snake/content/pics/star.png with 100% similarity]
examples/tutorials/samegame/shared/pics/yellowStone.png [moved from examples/declarative/samegame/content/pics/yellowStone.png with 100% similarity]
examples/tutorials/ui-components/dialcontrol/content/Dial.qml [moved from examples/declarative/ui-components/dialcontrol/content/Dial.qml with 100% similarity]
examples/tutorials/ui-components/dialcontrol/content/QuitButton.qml [new file with mode: 0644]
examples/tutorials/ui-components/dialcontrol/content/background.png [moved from examples/declarative/ui-components/dialcontrol/content/background.png with 100% similarity]
examples/tutorials/ui-components/dialcontrol/content/needle.png [moved from examples/declarative/ui-components/dialcontrol/content/needle.png with 100% similarity]
examples/tutorials/ui-components/dialcontrol/content/needle_shadow.png [moved from examples/declarative/ui-components/dialcontrol/content/needle_shadow.png with 100% similarity]
examples/tutorials/ui-components/dialcontrol/content/overlay.png [moved from examples/declarative/ui-components/dialcontrol/content/overlay.png with 100% similarity]
examples/tutorials/ui-components/dialcontrol/content/quit.png [new file with mode: 0644]
examples/tutorials/ui-components/dialcontrol/dialcontrol.qml [moved from examples/declarative/ui-components/dialcontrol/dialcontrol.qml with 100% similarity]
examples/tutorials/ui-components/flipable/content/5_heart.png [moved from examples/declarative/ui-components/flipable/content/5_heart.png with 100% similarity]
examples/tutorials/ui-components/flipable/content/9_club.png [moved from examples/declarative/ui-components/flipable/content/9_club.png with 100% similarity]
examples/tutorials/ui-components/flipable/content/Card.qml [moved from examples/declarative/ui-components/flipable/content/Card.qml with 100% similarity]
examples/tutorials/ui-components/flipable/content/back.png [moved from examples/declarative/ui-components/flipable/content/back.png with 100% similarity]
examples/tutorials/ui-components/flipable/flipable.qml [moved from examples/declarative/ui-components/flipable/flipable.qml with 100% similarity]
examples/tutorials/ui-components/progressbar/content/ProgressBar.qml [moved from examples/declarative/ui-components/progressbar/content/ProgressBar.qml with 100% similarity]
examples/tutorials/ui-components/progressbar/content/background.png [moved from examples/declarative/ui-components/progressbar/content/background.png with 100% similarity]
examples/tutorials/ui-components/progressbar/main.qml [moved from examples/declarative/ui-components/progressbar/main.qml with 100% similarity]
examples/tutorials/ui-components/scrollbar/ScrollBar.qml [moved from examples/declarative/ui-components/scrollbar/ScrollBar.qml with 100% similarity]
examples/tutorials/ui-components/scrollbar/main.qml [moved from examples/declarative/ui-components/scrollbar/main.qml with 100% similarity]
examples/tutorials/ui-components/scrollbar/pics/niagara_falls.jpg [moved from examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg with 100% similarity]
examples/tutorials/ui-components/scrollbar/scrollbar.qmlproject [moved from examples/declarative/ui-components/scrollbar/scrollbar.qmlproject with 100% similarity]
examples/tutorials/ui-components/searchbox/SearchBox.qml [moved from examples/declarative/ui-components/searchbox/SearchBox.qml with 100% similarity]
examples/tutorials/ui-components/searchbox/images/clear.png [moved from examples/declarative/ui-components/searchbox/images/clear.png with 100% similarity]
examples/tutorials/ui-components/searchbox/images/lineedit-bg-focus.png [moved from examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png with 100% similarity]
examples/tutorials/ui-components/searchbox/images/lineedit-bg.png [moved from examples/declarative/ui-components/searchbox/images/lineedit-bg.png with 100% similarity]
examples/tutorials/ui-components/searchbox/main.qml [moved from examples/declarative/ui-components/searchbox/main.qml with 100% similarity]
examples/tutorials/ui-components/searchbox/searchbox.qmlproject [moved from examples/declarative/ui-components/searchbox/searchbox.qmlproject with 100% similarity]
examples/tutorials/ui-components/slideswitch/content/Switch.qml [moved from examples/declarative/ui-components/slideswitch/content/Switch.qml with 100% similarity]
examples/tutorials/ui-components/slideswitch/content/background.png [moved from examples/declarative/ui-components/slideswitch/content/background.png with 100% similarity]
examples/tutorials/ui-components/slideswitch/content/background.svg [moved from examples/declarative/ui-components/slideswitch/content/background.svg with 100% similarity]
examples/tutorials/ui-components/slideswitch/content/knob.png [moved from examples/declarative/ui-components/slideswitch/content/knob.png with 100% similarity]
examples/tutorials/ui-components/slideswitch/content/knob.svg [moved from examples/declarative/ui-components/slideswitch/content/knob.svg with 100% similarity]
examples/tutorials/ui-components/slideswitch/slideswitch.qml [moved from examples/declarative/ui-components/slideswitch/slideswitch.qml with 100% similarity]
examples/tutorials/ui-components/spinner/content/Spinner.qml [moved from examples/declarative/ui-components/spinner/content/Spinner.qml with 100% similarity]
examples/tutorials/ui-components/spinner/content/spinner-bg.png [moved from examples/declarative/ui-components/spinner/content/spinner-bg.png with 100% similarity]
examples/tutorials/ui-components/spinner/content/spinner-select.png [moved from examples/declarative/ui-components/spinner/content/spinner-select.png with 100% similarity]
examples/tutorials/ui-components/spinner/main.qml [moved from examples/declarative/ui-components/spinner/main.qml with 100% similarity]
examples/tutorials/ui-components/spinner/spinner.qmlproject [moved from examples/declarative/ui-components/spinner/spinner.qmlproject with 100% similarity]
examples/tutorials/ui-components/tabwidget/TabWidget.qml [moved from examples/declarative/ui-components/tabwidget/TabWidget.qml with 100% similarity]
examples/tutorials/ui-components/tabwidget/main.qml [moved from examples/declarative/ui-components/tabwidget/main.qml with 100% similarity]
examples/tutorials/ui-components/tabwidget/tab.png [moved from examples/declarative/ui-components/tabwidget/tab.png with 100% similarity]
examples/tutorials/ui-components/tabwidget/tabwidget.qmlproject [moved from examples/declarative/ui-components/tabwidget/tabwidget.qmlproject with 100% similarity]
examples/window/Window.qml [moved from examples/declarative/window/Window.qml with 100% similarity]
examples/window/screen/screenInfo.qml [moved from examples/declarative/window/screen/screenInfo.qml with 100% similarity]
examples/window/standalone.qml [moved from examples/declarative/window/standalone.qml with 100% similarity]
examples/window/window.cpp [moved from examples/declarative/window/window.cpp with 100% similarity]
examples/window/window.pro [moved from examples/declarative/window/window.pro with 100% similarity]
tests/auto/qtquick2/examples/tst_examples.cpp

index e1bf85a..4c8776b 100644 (file)
@@ -1,20 +1,6 @@
 # This file is used to ignore files which are generated in the Qt build system
 # ----------------------------------------------------------------------------
 
-examples/*/*/*
-!examples/*/*/*[.]*
-!examples/*/*/README
-examples/*/*/*[.]app
-!examples/declarative/*
-!examples/tutorials/*
-!examples/tutorials/*/*
-!examples/ja_JP/*/*
-demos/*/*
-!demos/spectrum/*
-demos/spectrum/bin
-!demos/*/*[.]*
-demos/*/*[.]app
-!demos/declarative/*
 config.tests/*/*/*
 !config.tests/*/*/*[.]*
 config.tests/*/*/*[.]app
@@ -273,4 +259,4 @@ tests/auto/*/*.o
 tests/auto/*/*.moc
 tests/auto/*/*/*.o
 tests/auto/*/*/*.moc
-src/declarative/generated/
\ No newline at end of file
+src/declarative/generated/
index 69e8609..3f4645a 100644 (file)
@@ -19,7 +19,8 @@ headerdirs += ../src \
 imagedirs += ../src/images \
 
 sourcedirs += ../src \
-              ../../src
+              ../../src \
+              ../../examples
 
 #indexes = $QT5DOC/doc/html/qt.index
 
index 9a6dafa..a346794 100644 (file)
     \brief This is an internationalization example
 */
 /*!
-    \title QML Examples - Shader Effects
-    \example declarative/shadereffects
-    \image qml-shadereffects-example.png
-    \brief This is a shader effects example
-
-    This example demonstrates a couple of visual effects that you can perform
-    with shaders in QtQuick 2.0
-*/
-/*!
     \title QML Examples - Positioners
     \example declarative/positioners
     \brief This is a positioners example
     This example demonstrates the positioners and some of their animations.
 */
 /*!
-    \title QML Examples - Animation
-    \example declarative/animation
-    \brief This is a collection of QML examples
-    \image qml-animations-example.png
-
-    This is a collection of small QML examples relating to animation. Each example is
-    a small QML file, usually containing or emphasizing a particular element or
-    feature. You can run and observe the behavior of each example.
-*/
-/*!
     \title QML Examples - Image Elements
     \example declarative/imageelements
     \brief This is a collection of QML examples
index f076c1d..7414579 100644 (file)
 
 
 /*!
-    \title QML Example - Calculator
-    \example declarative/calculator
-    \brief This is an example application written in QML.
-    \image qml-calculator-demo-small.png
-*/
-
-/*!
     \title QML Example - Samegame
     \example declarative/samegame
     \brief This example demonstrates creating a game with javascript game logic.
diff --git a/examples/HACKING b/examples/HACKING
new file mode 100644 (file)
index 0000000..a3aa3e9
--- /dev/null
@@ -0,0 +1,23 @@
+Some guidelines for QtDeclarative examples
+
+Snippets
+---
+Snippets are snatches of QML code that won't even run on their own. They don't belong here, they belong in doc/src/snippets. They should be contained in files that will compile on their own, for automated syntax validation, but don't have to look like anything.
+
+Examples
+---
+
+Examples are large blocks of QML code that demonstrate a feature. You should be able to launch an example and visually see the feature take effect. Examples should be written in a small form, and should automatically activate any features. Ideally, when you run an example, you see the feature demonstrate itself over and over until you get bored and close the application using your platform's close window mechanism. Examples shouldn't contain their own close buttons or start screen, explanatory text should be kept to a minimum (show, not tell), and reserve interaction for demonstrating interactive elements). The code should be held to a high level of quality, and should be understandable by people new to QML.
+
+Unless the demonstrated feature uses it, assume no interface devices other than a screen that can show a 320x480 rectangle and a generic pointing device (with the shared subset of mouse/touch functionality).
+
+Groups of similar examples should be placed in one folder with a single launcher application, which uses the QtQuick.Examples module for common components.
+
+The example, or launcher application in case of groups, should contain a qdoc comment explaining the example. The example or launcher should be buildable as a full C++ application and runnable with the standard qml file launcher.
+
+Demos
+---
+
+Demos are examples of creating full applications using QML. They should fit both a desktop and a mobile form factor, they should have their own start screen and method of exiting the application. They should be at a level of quality that you'd be comfortable submitting them to an app store for a platform of the appropriate hardware (screen size, input methods, etc.). The code should be written to a level that is easily understood and modified by a QML expert.
+
+Demos should have a qdoc file in their directory explaining the demo at a high level. The demo should be buildable as a full C++ application and preferably runnable with the standard qml file launcher.
similarity index 99%
rename from examples/declarative/README
rename to examples/README
index 56c48d7..aba1e2c 100644 (file)
@@ -8,6 +8,5 @@ and loading data models from C++ and interacting with them.
 Mostof these examples can be viewed directly with the
 QML viewer utility, without requiring compilation.
 
-
 Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
deleted file mode 100644 (file)
index 883c0af..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-TEMPLATE = subdirs
-
-# These examples contain some C++ and need to be built
-SUBDIRS = \
-   cppextensions \
-   minehunt \
-   modelviews \
-   painteditem \
-   tutorials \
-   script
-
-# 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/examples/declarative/imageelements/borderimage.qml b/examples/declarative/imageelements/borderimage.qml
deleted file mode 100644 (file)
index 3dd5d1d..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "content"
-
-Rectangle {
-    id: page
-    width: 1030; height: 540
-
-    Grid {
-        anchors.centerIn: parent; spacing: 20
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-        }
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-            horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-            horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-            horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-            horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-            horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-            horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
-        }
-    }
-}
diff --git a/examples/declarative/imageelements/image.qml b/examples/declarative/imageelements/image.qml
deleted file mode 100644 (file)
index 4ca26c1..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "content"
-
-Rectangle {
-    width: 490
-    height: 285
-
-    Grid {
-        property int cellWidth: (width - (spacing * (columns - 1))) / columns
-        property int cellHeight: (height - (spacing * (rows - 1))) / rows
-
-        anchors.fill: parent
-        anchors.margins: 30
-
-        columns: 3
-        rows: 2
-        spacing: 30
-
-        ImageCell { mode: Image.Stretch; caption: "Stretch" }
-        ImageCell { mode: Image.PreserveAspectFit; caption: "PreserveAspectFit" }
-        ImageCell { mode: Image.PreserveAspectCrop; caption: "PreserveAspectCrop" }
-
-        ImageCell { mode: Image.Tile; caption: "Tile" }
-        ImageCell { mode: Image.TileHorizontally; caption: "TileHorizontally" }
-        ImageCell { mode: Image.TileVertically; caption: "TileVertically" }
-    }
-}
diff --git a/examples/declarative/shadereffects/shadereffects.qml b/examples/declarative/shadereffects/shadereffects.qml
deleted file mode 100644 (file)
index 842e42b..0000000
+++ /dev/null
@@ -1,300 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the Declarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "content"
-
-Image {
-    width: 640
-    height: 360
-    source: "../snake/content/pics/background.png"
-
-    ShaderEffectSource {
-        id: theSource
-        sourceItem: theItem
-        smooth: true
-    }
-
-    function saturate(x) {
-        return Math.min(Math.max(x, 0), 1)
-    }
-
-    function sliderToColor(x) {
-        return Qt.rgba(saturate(Math.max(2 - 6 * x, 6 * x - 4)),
-                        saturate(Math.min(6 * x, 4 - 6 * x)),
-                        saturate(Math.min(6 * x - 2, 6 - 6 * x)))
-    }
-
-    Grid {
-        anchors.centerIn: parent
-        columns: 3
-
-        Item {
-            id: theItem
-            width: 180
-            height: 180
-            ListView {
-                anchors.centerIn: parent
-                width: 160
-                height: 140
-                clip: true
-                snapMode: ListView.SnapOneItem
-                model: VisualItemModel {
-                    Text {
-                        width: 160
-                        height: 140
-                        horizontalAlignment: Text.AlignHCenter
-                        verticalAlignment: Text.AlignVCenter
-                        font.pixelSize: 120
-                        font.family: "Times"
-                        color: "blue"
-                        text: "Qt"
-                    }
-                    Image {
-                        width: 160
-                        height: 140
-                        source: "content/qt-logo.png"
-                        smooth: true
-                    }
-                    Image {
-                        width: 160
-                        height: 140
-                        source: "content/face-smile.png"
-                        smooth: true
-                    }
-                }
-            }
-        }
-        ShaderEffect {
-            width: 180
-            height: 180
-            property variant source: theSource
-            property real amplitude: 0.04 * wobbleSlider.value
-            property real frequency: 20
-            property real time: 0
-            NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
-            fragmentShader:
-                "uniform lowp float qt_Opacity;" +
-                "uniform highp float amplitude;" +
-                "uniform highp float frequency;" +
-                "uniform highp float time;" +
-                "uniform sampler2D source;" +
-                "varying highp vec2 qt_TexCoord0;" +
-                "void main() {" +
-                "    highp vec2 p = sin(time + frequency * qt_TexCoord0);" +
-                "    gl_FragColor = texture2D(source, qt_TexCoord0 + amplitude * vec2(p.y, -p.x)) * qt_Opacity;" +
-                "}"
-            Slider {
-                id: wobbleSlider
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                height: 40
-            }
-        }
-        ShaderEffect {
-            width: 180
-            height: 180
-            property variant source: theSource
-            property variant shadow: ShaderEffectSource {
-                smooth: true
-                sourceItem: ShaderEffect {
-                    width: theItem.width
-                    height: theItem.height
-                    property variant delta: Qt.size(0.0, 1.0 / height)
-                    property variant source: ShaderEffectSource {
-                        smooth: true
-                        sourceItem: ShaderEffect {
-                            width: theItem.width
-                            height: theItem.height
-                            property variant delta: Qt.size(1.0 / width, 0.0)
-                            property variant source: theSource
-                            fragmentShader: "
-                                uniform lowp float qt_Opacity;
-                                uniform sampler2D source;
-                                uniform highp vec2 delta;
-                                varying highp vec2 qt_TexCoord0;
-                                void main() {
-                                    gl_FragColor =(0.0538 * texture2D(source, qt_TexCoord0 - 3.182 * delta)
-                                                 + 0.3229 * texture2D(source, qt_TexCoord0 - 1.364 * delta)
-                                                 + 0.2466 * texture2D(source, qt_TexCoord0)
-                                                 + 0.3229 * texture2D(source, qt_TexCoord0 + 1.364 * delta)
-                                                 + 0.0538 * texture2D(source, qt_TexCoord0 + 3.182 * delta)) * qt_Opacity;
-                                }"
-                        }
-                    }
-                    fragmentShader: "
-                        uniform lowp float qt_Opacity;
-                        uniform sampler2D source;
-                        uniform highp vec2 delta;
-                        varying highp vec2 qt_TexCoord0;
-                        void main() {
-                            gl_FragColor =(0.0538 * texture2D(source, qt_TexCoord0 - 3.182 * delta)
-                                         + 0.3229 * texture2D(source, qt_TexCoord0 - 1.364 * delta)
-                                         + 0.2466 * texture2D(source, qt_TexCoord0)
-                                         + 0.3229 * texture2D(source, qt_TexCoord0 + 1.364 * delta)
-                                         + 0.0538 * texture2D(source, qt_TexCoord0 + 3.182 * delta)) * qt_Opacity;
-                        }"
-                }
-            }
-            property real angle: 0
-            property variant offset: Qt.point(15.0 * Math.cos(angle), 15.0 * Math.sin(angle))
-            NumberAnimation on angle { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 6000 }
-            property variant delta: Qt.size(offset.x / width, offset.y / height)
-            property real darkness: shadowSlider.value
-            fragmentShader: "
-                uniform lowp float qt_Opacity;
-                uniform highp vec2 offset;
-                uniform sampler2D source;
-                uniform sampler2D shadow;
-                uniform highp float darkness;
-                uniform highp vec2 delta;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    lowp vec4 fg = texture2D(source, qt_TexCoord0);
-                    lowp vec4 bg = texture2D(shadow, qt_TexCoord0 + delta);
-                    gl_FragColor = (fg + vec4(0., 0., 0., darkness * bg.a) * (1. - fg.a)) * qt_Opacity;
-                }"
-            Slider {
-                id: shadowSlider
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                height: 40
-            }
-        }
-        ShaderEffect {
-            width: 180
-            height: 180
-            property variant source: theSource
-            property variant delta: Qt.size(0.5 / width, 0.5 / height)
-            fragmentShader: "
-                uniform sampler2D source;
-                uniform highp vec2 delta;
-                uniform highp float qt_Opacity;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    lowp vec4 tl = texture2D(source, qt_TexCoord0 - delta);
-                    lowp vec4 tr = texture2D(source, qt_TexCoord0 + vec2(delta.x, -delta.y));
-                    lowp vec4 bl = texture2D(source, qt_TexCoord0 - vec2(delta.x, -delta.y));
-                    lowp vec4 br = texture2D(source, qt_TexCoord0 + delta);
-                    lowp vec4 gx = (tl + bl) - (tr + br);
-                    lowp vec4 gy = (tl + tr) - (bl + br);
-                    gl_FragColor.xyz = vec3(0.);
-                    gl_FragColor.w = clamp(dot(sqrt(gx * gx + gy * gy), vec4(1.)), 0., 1.) * qt_Opacity;
-                }"
-        }
-        ShaderEffect {
-            width: 180
-            height: 180
-            property variant source: theSource
-            property color tint: sliderToColor(colorizeSlider.value)
-            fragmentShader: "
-                uniform sampler2D source;
-                uniform lowp vec4 tint;
-                uniform lowp float qt_Opacity;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    lowp vec4 c = texture2D(source, qt_TexCoord0);
-                    lowp float lo = min(min(c.x, c.y), c.z);
-                    lowp float hi = max(max(c.x, c.y), c.z);
-                    gl_FragColor = qt_Opacity * vec4(mix(vec3(lo), vec3(hi), tint.xyz), c.w);
-                }"
-            Slider {
-                id: colorizeSlider
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                height: 40
-            }
-        }
-        ShaderEffect {
-            width: 180
-            height: 180
-            mesh: Qt.size(10, 10)
-            property variant source: theSource
-            property real bend: 0
-            property real minimize: 0
-            property real side: genieSlider.value
-            SequentialAnimation on bend {
-                loops: Animation.Infinite
-                NumberAnimation { to: 1; duration: 700; easing.type: Easing.InOutSine }
-                PauseAnimation { duration: 1600 }
-                NumberAnimation { to: 0; duration: 700; easing.type: Easing.InOutSine }
-                PauseAnimation { duration: 1000 }
-            }
-            SequentialAnimation on minimize {
-                loops: Animation.Infinite
-                PauseAnimation { duration: 300 }
-                NumberAnimation { to: 1; duration: 700; easing.type: Easing.InOutSine }
-                PauseAnimation { duration: 1000 }
-                NumberAnimation { to: 0; duration: 700; easing.type: Easing.InOutSine }
-                PauseAnimation { duration: 1300 }
-            }
-            vertexShader: "
-                uniform highp mat4 qt_Matrix;
-                uniform highp float bend;
-                uniform highp float minimize;
-                uniform highp float side;
-                uniform highp float width;
-                uniform highp float height;
-                attribute highp vec4 qt_Vertex;
-                attribute highp vec2 qt_MultiTexCoord0;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    qt_TexCoord0 = qt_MultiTexCoord0;
-                    highp vec4 pos = qt_Vertex;
-                    pos.y = mix(qt_Vertex.y, height, minimize);
-                    highp float t = pos.y / height;
-                    t = (3. - 2. * t) * t * t;
-                    pos.x = mix(qt_Vertex.x, side * width, t * bend);
-                    gl_Position = qt_Matrix * pos;
-                }"
-            Slider {
-                id: genieSlider
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                height: 40
-            }
-        }
-    }
-}
diff --git a/examples/declarative/tutorials/tutorials.pro b/examples/declarative/tutorials/tutorials.pro
deleted file mode 100644 (file)
index 0a82c1e..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    extending
-
diff --git a/examples/declarative/tutorials/tutorials.qmlproject b/examples/declarative/tutorials/tutorials.qmlproject
deleted file mode 100644 (file)
index 2bb4016..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-}
@@ -72,7 +72,7 @@ BorderImage {
         id: mouseArea
         anchors.fill: parent
         onClicked: {
-            doOp(operation)
+            window.doOp(operation)
             button.clicked()
         }
     }
@@ -15,6 +15,10 @@ function disabled(op) {
 }
 
 function doOperation(op) {
+    if (op == '*')//Keyboard Aliases
+        op = multiplication;
+    if (op == '/')
+        op = division;
     if (disabled(op)) {
         return
     }
diff --git a/examples/demos/calculator/calculator-desktop.qml b/examples/demos/calculator/calculator-desktop.qml
new file mode 100644 (file)
index 0000000..7e72f50
--- /dev/null
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Window 2.0
+import "CalculatorCore"
+import "CalculatorCore/calculator.js" as CalcEngine
+
+Rectangle {
+    id: window
+
+    width: 640; height: 480
+    color: "#282828"
+
+    property string rotateLeft: "\u2939"
+    property string rotateRight: "\u2935"
+    property string leftArrow: "\u2190"
+    property string division : "\u00f7"
+    property string multiplication : "\u00d7"
+    property string squareRoot : "\u221a"
+    property string plusminus : "\u00b1"
+
+    function doOp(operation) { CalcEngine.doOperation(operation) }
+    focus: true
+    Keys.onPressed: doOp(event.text);
+
+    Item {
+        id: main
+        width: 640
+        height: 480
+        anchors.centerIn: parent
+
+        Column {
+            id: box; spacing: 8
+
+            anchors { fill: parent; topMargin: 6; bottomMargin: 6; leftMargin: 6; rightMargin: 6 }
+
+            Display {
+                id: display
+                width: box.width-3
+                height: 64
+            }
+
+            Column {
+                id: column; spacing: 6
+
+                property real h: ((box.height - 72) / 6) - ((spacing * (6 - 1)) / 6)
+                property real w: (box.width / 4) - ((spacing * (4 - 1)) / 4)
+
+                Row {
+                    spacing: 6
+                    Button { width: column.w; height: column.h; color: 'purple'; operation: "Off" }
+                    Button { width: column.w; height: column.h; color: 'purple'; operation: leftArrow }
+                    Button { width: column.w; height: column.h; color: 'purple'; operation: "C" }
+                    Button { width: column.w; height: column.h; color: 'purple'; operation: "AC" }
+                }
+
+                Row {
+                    spacing: 6
+                    property real w: (box.width / 4) - ((spacing * (4 - 1)) / 4)
+
+                    Button { width: column.w; height: column.h; color: 'green'; operation: "mc" }
+                    Button { width: column.w; height: column.h; color: 'green'; operation: "m+" }
+                    Button { width: column.w; height: column.h; color: 'green'; operation: "m-" }
+                    Button { width: column.w; height: column.h; color: 'green'; operation: "mr" }
+                }
+
+                Grid {
+                    id: grid; rows: 5; columns: 5; spacing: 6
+
+                    property real w: (box.width / columns) - ((spacing * (columns - 1)) / columns)
+
+                    Button { width: grid.w; height: column.h; operation: "7"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "8"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "9"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: division }
+                    Button { width: grid.w; height: column.h; operation: squareRoot }
+                    Button { width: grid.w; height: column.h; operation: "4"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "5"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "6"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: multiplication }
+                    Button { width: grid.w; height: column.h; operation: "x^2" }
+                    Button { width: grid.w; height: column.h; operation: "1"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "2"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "3"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "-" }
+                    Button { width: grid.w; height: column.h; operation: "1/x" }
+                    Button { width: grid.w; height: column.h; operation: "0"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "." }
+                    Button { width: grid.w; height: column.h; operation: plusminus }
+                    Button { width: grid.w; height: column.h; operation: "+" }
+                    Button { width: grid.w; height: column.h; operation: "="; color: 'red' }
+                }
+            }
+        }
+
+    }
+}
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import "content"
-import "content/calculator.js" as CalcEngine
+import "CalculatorCore"
+import "CalculatorCore/calculator.js" as CalcEngine
 
 Rectangle {
     id: window
 
-    width: 360; height: 480
+    width: 320; height: 480
     color: "#282828"
 
     property string rotateLeft: "\u2939"
@@ -64,6 +64,7 @@ Rectangle {
         id: main
         state: "orientation " + Screen.orientation
 
+        //Note: Assumes a primarily portrait device
         property bool landscapeWindow: window.width > window.height 
         property real baseWidth: landscapeWindow ? window.height : window.width
         property real baseHeight: landscapeWindow ? window.width : window.height
diff --git a/examples/demos/calculator/calculator.pro b/examples/demos/calculator/calculator.pro
new file mode 100644 (file)
index 0000000..3bf3b8c
--- /dev/null
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick declarative
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/calculator
+qml.files = calculator-desktop.qml calculator-mobile.qml CalculatorCore
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/calculator
+INSTALLS += target qml
diff --git a/examples/demos/calculator/calculator.qdoc b/examples/demos/calculator/calculator.qdoc
new file mode 100644 (file)
index 0000000..e94bdb4
--- /dev/null
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \title QML Demo - Calculator
+    \example declarative/calculator
+    \brief This is an example calculator application written in QML.
+    \image qml-calculator-demo-small.png
+
+    The Calculator demo implements a simple calculator in QML. It is written for desktop and portrait devices,
+    although on device it supports orientation changes.
+*/
+
diff --git a/examples/demos/calculator/main.cpp b/examples/demos/calculator/main.cpp
new file mode 100644 (file)
index 0000000..c7f9b29
--- /dev/null
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QGuiApplication>
+#include <QStringList>
+#include <QQuickView>
+#include <QDeclarativeEngine>
+
+void usage()
+{
+    printf("Pass -desktop to use the Desktop UI");
+    exit(0);
+}
+
+int main(int argc, char* argv[])
+{
+    QGuiApplication app(argc,argv);
+    QQuickView view;
+    QUrl launchFile = QUrl::fromLocalFile(QLatin1String("calculator-mobile.qml"));
+    if (app.arguments().contains(QLatin1String("-help")))
+        usage();
+    if (app.arguments().contains(QLatin1String("-desktop")))
+        launchFile =  QUrl::fromLocalFile(QLatin1String("calculator-desktop.qml"));
+    view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));
+    view.setSource(launchFile);
+    view.show();
+    return app.exec();
+}
+
diff --git a/examples/demos/demos.pro b/examples/demos/demos.pro
new file mode 100644 (file)
index 0000000..abe718b
--- /dev/null
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = calculator
@@ -48,7 +48,7 @@ Item {
     property int activeSuns: 0
     property int centerOffset: 72
 
-    height: 480; width: 360
+    height: 480; width: 320
 
 
     MouseArea {
similarity index 87%
rename from examples/declarative/snake/content/Skull.qml
rename to examples/demos/snake/content/Skull.qml
index ce3d108..9026790 100644 (file)
@@ -48,10 +48,10 @@ Image {
     property int verticalMovement;
     property int horizontalMovement;
 
-    x: margin + column * gridSize + 2
-    y: margin + row * gridSize - 3
-    Behavior on x { NumberAnimation { duration: spawned ? halfbeatInterval : 0} }
-    Behavior on y { NumberAnimation { duration: spawned ? halfbeatInterval : 0 } }
+    x: screen.margin + column * screen.gridSize + 2
+    y: screen.margin + row * screen.gridSize - 3
+    Behavior on x { NumberAnimation { duration: spawned ? screen.halfbeatInterval : 0} }
+    Behavior on y { NumberAnimation { duration: spawned ? screen.halfbeatInterval : 0 } }
 
     opacity: spawned ? 1 : 0
     Behavior on opacity { NumberAnimation { duration: 200 } }
similarity index 93%
rename from examples/declarative/snake/snake.qml
rename to examples/demos/snake/snake.qml
index f25b626..fca3273 100644 (file)
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import "content" as Content
 import "content/snake.js" as Logic
-
+Item{
 Rectangle {
     id: screen;
     SystemPalette { id: activePalette }
@@ -75,14 +75,14 @@ Rectangle {
 
     Timer {
         id: heartbeat;
-        interval: heartbeatInterval;
-        running: activeGame
+        interval: screen.heartbeatInterval;
+        running: screen.activeGame
         repeat: true
         onTriggered: { Logic.move() }
     }
     Timer {
         id: halfbeat;
-        interval: halfbeatInterval;
+        interval: screen.halfbeatInterval;
         repeat: true
         running: heartbeat.running
         onTriggered: { Logic.moveSkull() }
@@ -96,7 +96,7 @@ Rectangle {
     Timer {
         id: startHeartbeatTimer;
         interval: 1000 ;
-        onTriggered: { state = "running"; activeGame = true; }
+        onTriggered: { screen.state = "running"; screen.activeGame = true; }
     }
 
     Image{
@@ -138,7 +138,7 @@ Rectangle {
                     font.pointSize: 24
                     anchors.horizontalCenter: parent.horizontalCenter;
                     //horizontalAlignment: Text.AlignHCenter
-                    text: "Last Score:\t" + lastScore + "\nHighscore:\t" + highScores.topScore;
+                    text: "Last Score:\t" + screen.lastScore + "\nHighscore:\t" + highScores.topScore;
                 }
             }
         }
@@ -158,8 +158,8 @@ Rectangle {
             color: "transparent"
             anchors.horizontalCenter: parent.horizontalCenter
             y: (screen.height - 32 - height)/2;
-            width: numColumnsAvailable * gridSize + 2*margin
-            height: numRowsAvailable * gridSize + 2*margin
+            width: screen.numColumnsAvailable * screen.gridSize + 2*screen.margin
+            height: screen.numRowsAvailable * screen.gridSize + 2*screen.margin
 
 
             Content.Skull {
@@ -226,7 +226,7 @@ Rectangle {
 
         Text {
             color: activePalette.text
-            text: "Score: " + score; font.bold: true
+            text: "Score: " + screen.score; font.bold: true
             anchors.right: parent.right; anchors.rightMargin: 3
             anchors.verticalCenter: parent.verticalCenter
         }
@@ -270,3 +270,4 @@ Rectangle {
     ]
 
 }
+}
diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro
deleted file mode 100644 (file)
index 81334fa..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS +=  qmleasing qmlflickr qmldialcontrol qmlcalculator qmlphotoviewer qmlclocks qmltwitter
diff --git a/examples/embedded/qmlcalculator/deployment.pri b/examples/embedded/qmlcalculator/deployment.pri
deleted file mode 100644 (file)
index a3627b8..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-qmlcalculator_src = $$PWD/../../declarative/calculator
-
-qmlcalculator_files.files = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core
-DEPLOYMENT += qmlcalculator_files
diff --git a/examples/embedded/qmlcalculator/qmlcalculator.cpp b/examples/embedded/qmlcalculator/qmlcalculator.cpp
deleted file mode 100644 (file)
index 4be7bc4..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    const QString mainQmlApp = QLatin1String("calculator.qml");
-    QDeclarativeView view;
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-
-#if defined(QT_KEYPAD_NAVIGATION)
-    QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
-#endif // QT_KEYPAD_NAVIGATION
-
-    view.show();
-    return application.exec();
-}
diff --git a/examples/embedded/qmlcalculator/qmlcalculator.pro b/examples/embedded/qmlcalculator/qmlcalculator.pro
deleted file mode 100644 (file)
index 25c16ca..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative
-SOURCES += $$PWD/qmlcalculator.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmlclocks/deployment.pri b/examples/embedded/qmlclocks/deployment.pri
deleted file mode 100644 (file)
index 771a4db..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-qmlclocks_src = $$PWD/../../../examples/declarative/toys/clocks
-
-qmlclocks_files.files = $$qmlclocks_src/clocks.qml $$qmlclocks_src/content
-DEPLOYMENT += qmlclocks_files
diff --git a/examples/embedded/qmlclocks/qmlclocks.cpp b/examples/embedded/qmlclocks/qmlclocks.cpp
deleted file mode 100644 (file)
index ce42ec7..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    const QString mainQmlApp = QLatin1String("clocks.qml");
-    QDeclarativeView view;
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-
-#if defined(QT_KEYPAD_NAVIGATION)
-    QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
-#endif // QT_KEYPAD_NAVIGATION
-
-    view.show();
-    return application.exec();
-}
diff --git a/examples/embedded/qmlclocks/qmlclocks.pro b/examples/embedded/qmlclocks/qmlclocks.pro
deleted file mode 100644 (file)
index 8e9dcdf..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative
-SOURCES += $$PWD/qmlclocks.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmldialcontrol/deployment.pri b/examples/embedded/qmldialcontrol/deployment.pri
deleted file mode 100644 (file)
index d845120..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-qmldialcontrol_src = $$PWD/../../../examples/declarative/ui-components/dialcontrol
-
-qmldialcontrol_files.files = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content
-DEPLOYMENT += qmldialcontrol_files
diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp
deleted file mode 100644 (file)
index e66f6f6..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    const QString mainQmlApp = QLatin1String("dialcontrol.qml");
-    QDeclarativeView view;
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-
-#if defined(QT_KEYPAD_NAVIGATION)
-    QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
-#endif // QT_KEYPAD_NAVIGATION
-
-    view.show();
-    return application.exec();
-}
diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.pro b/examples/embedded/qmldialcontrol/qmldialcontrol.pro
deleted file mode 100644 (file)
index 08f876b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative
-SOURCES += $$PWD/qmldialcontrol.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmleasing/deployment.pri b/examples/embedded/qmleasing/deployment.pri
deleted file mode 100644 (file)
index 7a5d040..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-qmleasing_src = $$PWD/../../../examples/declarative/animation/easing
-
-qmleasing_files.files = $$qmleasing_src/easing.qml $$qmleasing_src/content
-DEPLOYMENT += qmleasing_files
diff --git a/examples/embedded/qmleasing/qmleasing.cpp b/examples/embedded/qmleasing/qmleasing.cpp
deleted file mode 100644 (file)
index 8220e03..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    const QString mainQmlApp = QLatin1String("easing.qml");
-    QDeclarativeView view;
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-
-#if defined(QT_KEYPAD_NAVIGATION)
-    QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
-#endif // QT_KEYPAD_NAVIGATION
-
-    view.show();
-    return application.exec();
-}
diff --git a/examples/embedded/qmleasing/qmleasing.pro b/examples/embedded/qmleasing/qmleasing.pro
deleted file mode 100644 (file)
index c9f008d..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative
-SOURCES += $$PWD/qmleasing.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmlflickr/deployment.pri b/examples/embedded/qmlflickr/deployment.pri
deleted file mode 100644 (file)
index 0d76ddc..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-qmlflickr_src = $$PWD/../../declarative/flickr
-
-qmlflickr_files.files = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile
-DEPLOYMENT += qmlflickr_files
diff --git a/examples/embedded/qmlflickr/qmlflickr.cpp b/examples/embedded/qmlflickr/qmlflickr.cpp
deleted file mode 100644 (file)
index 93b28f7..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkConfigurationManager>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtDeclarative/QDeclarativeEngine>
-
-// Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise
-// the system default.
-class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
-{
-public:
-    ~NetworkAccessManagerFactory() { }
-
-    QNetworkAccessManager *create(QObject *parent);
-};
-
-QNetworkAccessManager *NetworkAccessManagerFactory::create(QObject *parent)
-{
-    QNetworkAccessManager *accessManager = new QNetworkAccessManager(parent);
-
-    QNetworkConfigurationManager manager;
-    if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
-        // Get saved network configuration
-        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
-        settings.beginGroup(QLatin1String("QtNetwork"));
-        const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
-        settings.endGroup();
-
-        // If the saved network configuration is not currently discovered use the system default
-        QNetworkConfiguration config = manager.configurationFromIdentifier(id);
-        if ((config.state() & QNetworkConfiguration::Discovered) !=
-            QNetworkConfiguration::Discovered) {
-            config = manager.defaultConfiguration();
-        }
-
-        accessManager->setConfiguration(config);
-    }
-
-    return accessManager;
-}
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    NetworkAccessManagerFactory networkAccessManagerFactory;
-
-    const QString mainQmlApp = QLatin1String("flickr.qml");
-    QDeclarativeView view;
-    view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory);
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-    view.setGeometry(QRect(100, 100, 360, 640));
-    view.show();
-    return application.exec();
-}
-
diff --git a/examples/embedded/qmlflickr/qmlflickr.pro b/examples/embedded/qmlflickr/qmlflickr.pro
deleted file mode 100644 (file)
index 869d651..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative network
-SOURCES += $$PWD/qmlflickr.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmlphotoviewer/deployment.pri b/examples/embedded/qmlphotoviewer/deployment.pri
deleted file mode 100644 (file)
index 5043739..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-qmlphotoviewer_src = $$PWD/../../declarative/photoviewer
-
-qmlphotoviewer_files.files = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore
-DEPLOYMENT += qmlphotoviewer_files
diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
deleted file mode 100644 (file)
index 32c9d24..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkConfigurationManager>
-#include <QtNetwork/QNetworkAccessManager>
-
-// Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise
-// the system default.
-class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
-{
-public:
-    ~NetworkAccessManagerFactory() { }
-
-    QNetworkAccessManager *create(QObject *parent);
-};
-
-QNetworkAccessManager *NetworkAccessManagerFactory::create(QObject *parent)
-{
-    QNetworkAccessManager *accessManager = new QNetworkAccessManager(parent);
-
-    QNetworkConfigurationManager manager;
-    if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
-        // Get saved network configuration
-        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
-        settings.beginGroup(QLatin1String("QtNetwork"));
-        const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
-        settings.endGroup();
-
-        // If the saved network configuration is not currently discovered use the system default
-        QNetworkConfiguration config = manager.configurationFromIdentifier(id);
-        if ((config.state() & QNetworkConfiguration::Discovered) !=
-            QNetworkConfiguration::Discovered) {
-            config = manager.defaultConfiguration();
-        }
-
-        accessManager->setConfiguration(config);
-    }
-
-    return accessManager;
-}
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    NetworkAccessManagerFactory networkAccessManagerFactory;
-
-    const QString mainQmlApp = QLatin1String("photoviewer.qml");
-    QDeclarativeView view;
-    view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory);
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-    view.setGeometry(QRect(100, 100, 360, 640));
-    view.show();
-    return application.exec();
-}
-
diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
deleted file mode 100644 (file)
index 9941b2e..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative network
-SOURCES += $$PWD/qmlphotoviewer.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmltwitter/deployment.pri b/examples/embedded/qmltwitter/deployment.pri
deleted file mode 100644 (file)
index a3c045c..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-qmltwitter_src = $$PWD/../../declarative/twitter
-
-qmltwitter_files.files = $$qmltwitter_src/twitter.qml $$qmltwitter_src/TwitterCore
-DEPLOYMENT += qmltwitter_files
diff --git a/examples/embedded/qmltwitter/qmltwitter.cpp b/examples/embedded/qmltwitter/qmltwitter.cpp
deleted file mode 100644 (file)
index 19b187b..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkConfigurationManager>
-#include <QtNetwork/QNetworkAccessManager>
-
-// Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise
-// the system default.
-class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
-{
-public:
-    ~NetworkAccessManagerFactory() { }
-
-    QNetworkAccessManager *create(QObject *parent);
-};
-
-QNetworkAccessManager *NetworkAccessManagerFactory::create(QObject *parent)
-{
-    QNetworkAccessManager *accessManager = new QNetworkAccessManager(parent);
-
-    QNetworkConfigurationManager manager;
-    if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
-        // Get saved network configuration
-        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
-        settings.beginGroup(QLatin1String("QtNetwork"));
-        const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
-        settings.endGroup();
-
-        // If the saved network configuration is not currently discovered use the system default
-        QNetworkConfiguration config = manager.configurationFromIdentifier(id);
-        if ((config.state() & QNetworkConfiguration::Discovered) !=
-            QNetworkConfiguration::Discovered) {
-            config = manager.defaultConfiguration();
-        }
-
-        accessManager->setConfiguration(config);
-    }
-
-    return accessManager;
-}
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    NetworkAccessManagerFactory networkAccessManagerFactory;
-
-    const QString mainQmlApp = QLatin1String("twitter.qml");
-    QDeclarativeView view;
-    view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory);
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-    view.setGeometry(QRect(100, 100, 360, 640));
-    view.show();
-    return application.exec();
-}
-
diff --git a/examples/embedded/qmltwitter/qmltwitter.pro b/examples/embedded/qmltwitter/qmltwitter.pro
deleted file mode 100644 (file)
index ce40cd7..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative network
-SOURCES += $$PWD/qmltwitter.cpp
-include($$PWD/deployment.pri)
index 2c9497d..2b78ed7 100644 (file)
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS += declarative tutorials
+SUBDIRS += demos shared localstorage particles qml qtquick tutorials window
 contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
diff --git a/examples/localstorage/localstorage.pro b/examples/localstorage/localstorage.pro
new file mode 100644 (file)
index 0000000..9671085
--- /dev/null
@@ -0,0 +1 @@
+TEMPLATE = subdirs
diff --git a/examples/particles/particles.pro b/examples/particles/particles.pro
new file mode 100644 (file)
index 0000000..9671085
--- /dev/null
@@ -0,0 +1 @@
+TEMPLATE = subdirs
diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro
new file mode 100644 (file)
index 0000000..9671085
--- /dev/null
@@ -0,0 +1 @@
+TEMPLATE = subdirs
diff --git a/examples/qtquick/accessibility/accessibility.pro b/examples/qtquick/accessibility/accessibility.pro
new file mode 100644 (file)
index 0000000..20d68e0
--- /dev/null
@@ -0,0 +1,10 @@
+TEMPLATE = app
+
+QT += quick declarative
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/accessibility
+qml.files = accessibility.qml content
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/accessibility
+INSTALLS += target qml
+
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Window 2.0
-import "widgets"
+import "content"
+
+/*!
+    \title QtQuick Examples - Accessibility
+    \example qtquick/accessibility
+    \brief This example has accessible buttons.
+
+*/
 
 Rectangle {
     id: window
 
-    width: 360; height: 300
+    width: 320; height: 480
     color: "white"
 
     Column {
@@ -70,7 +76,6 @@ Rectangle {
                 Accessible.role: Accessible.StaticText
                 Accessible.name: text
                 text: "Subject:"
-                width: 50
             }
             Rectangle {
                 id: subjectBorder
@@ -79,7 +84,7 @@ Rectangle {
                 border.width: 1
                 border.color: "black"
                 height: subjectEdit.height
-                width: 304
+                width: 240
                 TextInput {
                     id: subjectEdit
                     text: "Vacation plans"
@@ -92,8 +97,8 @@ Rectangle {
             property alias text : textEdit.text
             border.width: 1
             border.color: "black"
-            width: parent.width
-            height: textEdit.height
+            width: parent.width - 2
+            height: parent.height - (textBorder.y + column.spacing)
             TextEdit {
                 id: textEdit
                 text: "Hi, we're going to the Dolomites this summer. Weren't you also going to northern Italy? \n\nbest wishes, your friend Luke"
diff --git a/examples/qtquick/accessibility/accessibility.qmlproject b/examples/qtquick/accessibility/accessibility.qmlproject
new file mode 100644 (file)
index 0000000..04a3190
--- /dev/null
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+    mainFile: "accessibility.qml"
+
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+}
@@ -44,6 +44,7 @@ import QtQuick 2.0
 Rectangle {
     id: button
 
+    property bool checked: false
     property alias text : buttonText.text
     Accessible.name: text
     Accessible.description: "This button does " + text
diff --git a/examples/qtquick/accessibility/main.cpp b/examples/qtquick/accessibility/main.cpp
new file mode 100644 (file)
index 0000000..89e23b4
--- /dev/null
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(accessibility)
diff --git a/examples/qtquick/animation/animation.pro b/examples/qtquick/animation/animation.pro
new file mode 100644 (file)
index 0000000..7e4cf9e
--- /dev/null
@@ -0,0 +1,10 @@
+TEMPLATE = app
+
+QT += quick declarative
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/animation
+qml.files = animation.qml  basics  behaviors  easing pathanimation  pathinterpolator  states
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/animation
+INSTALLS += target qml
+
similarity index 69%
rename from examples/declarative/animation/animation.qml
rename to examples/qtquick/animation/animation.qml
index 7c5829e..62a85a9 100644 (file)
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared"
+import "../../shared" as Examples
+
+/*!
+    \title QtQuick Examples - Animation
+    \example qtquick/animation
+    \brief This is a collection of QML Animation examples.
+    \image qml-animations-example.png
+
+    This is a collection of small QML examples relating to animation. Each example is
+    a small QML file emphasizing a particular element or feature.
+
+    ColorAnimation demonstrates using a color animation to fade a sky from day to night.
+
+    PropertyAnimation demonstrates using a number animation to bounce a circle up and down.
+
+    Behaviors demonstrates using behaviors to animate moving a rectangle to whereever you click.
+
+    Wiggly Text demonstrates using more complex behaviors to animate and wiggle some text around as you drag it.
+
+    Easing Curves shows off all the easing curves available in Qt Quick animations.
+
+    States demonstrates how the properties of an item can vary between states.
+
+    Transitions takes the States example and animates the property changes.
+
+    PathAnimation animates an image along a beizer curve using a PathAnimation.
+
+    PathInterpolator animates an image along the same beizer curve, using a PathInterpolator instead.
+*/
 
 Item {
     height: 480
     width: 320
-    LauncherList {
+    Examples.LauncherList {
         id: ll
         anchors.fill: parent
         Component.onCompleted: {
             addExample("ColorAnimation", "Interpolates between colors",  Qt.resolvedUrl("basics/color-animation.qml"));
             addExample("PropertyAnimation", "Interpolates between numbers", Qt.resolvedUrl("basics/property-animation.qml"));
             addExample("Behaviors", "Animates procedural movement", Qt.resolvedUrl("behaviors/behavior-example.qml"));
-            addExample("WigglyText", "Text that wiggles as you drag it", Qt.resolvedUrl("behaviors/wigglytext.qml"));
+            addExample("Wiggly Text", "Text that wiggles as you drag it", Qt.resolvedUrl("behaviors/wigglytext.qml"));
             addExample("Easing Curves", "Compare available easing curves", Qt.resolvedUrl("easing/easing.qml"));
             addExample("States", "Simple states", Qt.resolvedUrl("states/states.qml"));
             addExample("Transitions", "Simple states with animated transitions", Qt.resolvedUrl("states/transitions.qml"));
@@ -43,7 +43,7 @@ import QtQuick.Particles 2.0
 
 Item {
     id: window
-    width: 640; height: 480
+    width: 320; height: 480
 
     // Let's draw the sky...
     Rectangle {
@@ -41,7 +41,7 @@
 import QtQuick 2.0
 
 Rectangle {
-    width: 600; height: 400
+    width: 320; height: 480
     color: "#343434"
 
     Rectangle {
@@ -43,10 +43,10 @@ import QtQuick 2.0
 Rectangle {
     id: container
 
-    property string text: "Drag this text..."
+    property string text: "Drag me!"
     property bool animated: true
 
-    width: 640; height: 480; color: "#474747"; focus: true
+    width: 320; height: 480; color: "#474747"; focus: true
 
     Keys.onPressed: {
         if (event.key == Qt.Key_Delete || event.key == Qt.Key_Backspace)
@@ -86,7 +86,7 @@ Rectangle {
             id: letter
             property variant follow
 
-            x: follow ? follow.x + follow.width : container.width / 3
+            x: follow ? follow.x + follow.width : container.width / 6
             y: follow ? follow.y : container.height / 2
 
             font.pixelSize: 40; font.bold: true
@@ -43,7 +43,7 @@ import "content"
 
 Rectangle {
     id: window
-    width: 600; height: 460; color: "#232323"
+    width: 320; height: 480; color: "#232323"
 
     property var easingCurve: [ 0.2, 0.2, 0.13, 0.65, 0.2, 0.8,
                                 0.624, 0.98, 0.93, 0.95, 1, 1 ]
@@ -141,22 +141,9 @@ Rectangle {
 
     Flickable {
         anchors.fill: parent
-        contentHeight: layout.height+50
-        Rectangle {
-            id: titlePane
-            color: "#444444"
-            height: 35
-            anchors { top: parent.top; left: parent.left; right: parent.right }
-            QuitButton {
-                id: quitButton
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.right: parent.right
-                anchors.rightMargin: 10
-            }
-        }
+        contentHeight: layout.height
         Column {
             id: layout
-            anchors { top: titlePane.bottom; topMargin: 10; left: parent.left; right: parent.right }
             Repeater { model: easingTypes; delegate: delegate }
         }
     }
diff --git a/examples/qtquick/animation/main.cpp b/examples/qtquick/animation/main.cpp
new file mode 100644 (file)
index 0000000..799dfd7
--- /dev/null
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(animation)
@@ -42,8 +42,8 @@ import QtQuick 2.0
 
 Rectangle {
     id: window
-    width: 400
-    height: 400
+    width: 320
+    height: 480
 
     Canvas {
         id: canvas
@@ -51,6 +51,7 @@ Rectangle {
         smooth: true
 
         onPaint: {
+            var context = canvas.getContext("2d")
             context.clearRect(0, 0, width, height)
             context.strokeStyle = "black"
             context.path = pathAnim.path
@@ -58,27 +59,33 @@ Rectangle {
         }
     }
 
-    PathAnimation {
-        id: pathAnim
+    SequentialAnimation {
+        running: true
+        loops: -1
 
-        duration: 2000
-        easing.type: Easing.InQuad
+        PauseAnimation { duration: 1000 }
+        PathAnimation {
+            id: pathAnim
 
-        target: box
-        orientation: PathAnimation.RightFirst
-        anchorPoint: Qt.point(box.width/2, box.height/2)
-        path: Path {
-            startX: 50; startY: 50
+            duration: 2000
+            easing.type: Easing.InQuad
 
-            PathCubic {
-                x: window.width - 50
-                y: window.height - 50
+            target: box
+            orientation: PathAnimation.RightFirst
+            anchorPoint: Qt.point(box.width/2, box.height/2)
+            path: Path {
+                startX: 50; startY: 50
 
-                control1X: x; control1Y: 50
-                control2X: 50; control2Y: y
-            }
+                PathCubic {
+                    x: window.width - 50
+                    y: window.height - 50
+
+                    control1X: x; control1Y: 50
+                    control2X: 50; control2Y: y
+                }
 
-            onChanged: canvas.requestPaint()
+                onChanged: canvas.requestPaint()
+            }
         }
     }
 
@@ -95,14 +102,4 @@ Rectangle {
             text: "Box"
         }
     }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: pathAnim.restart()
-    }
-
-    Text {
-        text: "Click anywhere to animate along the path"
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
 }
@@ -42,8 +42,8 @@ import QtQuick 2.0
 
 Rectangle {
     id: window
-    width: 400
-    height: 400
+    width: 320
+    height: 480
 
     Canvas {
         id: canvas
@@ -51,6 +51,7 @@ Rectangle {
         smooth: true
 
         onPaint: {
+            var context = canvas.getContext("2d")
             context.clearRect(0, 0, width, height)
             context.strokeStyle = "black"
             context.path = motionPath.path
@@ -75,12 +76,17 @@ Rectangle {
             onChanged: canvas.requestPaint()
         }
 
-        NumberAnimation on progress {
-            id: progressAnim
-            running: false
-            from: 0; to: 1
-            duration: 2000
-            easing.type: Easing.InQuad
+        SequentialAnimation on progress {
+            running: true
+            loops: -1
+            PauseAnimation { duration: 1000 }
+            NumberAnimation {
+                id: progressAnim
+                running: false
+                from: 0; to: 1
+                duration: 2000
+                easing.type: Easing.InQuad
+            }
         }
     }
 
@@ -103,13 +109,4 @@ Rectangle {
         }
     }
 
-    MouseArea {
-        anchors.fill: parent
-        onClicked: progressAnim.restart()
-    }
-
-    Text {
-        text: "Click anywhere to animate along the path"
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
 }
diff --git a/examples/qtquick/imageelements/borderimage.qml b/examples/qtquick/imageelements/borderimage.qml
new file mode 100644 (file)
index 0000000..7e13249
--- /dev/null
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "content"
+
+Rectangle {
+    id: page
+    width: 320
+    height: 480
+
+    Flickable {
+        anchors.fill: parent
+        contentWidth: 1030
+        contentHeight: 540
+        Grid {
+            anchors.centerIn: parent; spacing: 20
+
+            MyBorderImage {
+                minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+                source: "content/colors.png"; margin: 30
+            }
+
+            MyBorderImage {
+                minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+                source: "content/colors.png"; margin: 30
+                horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+            }
+
+            MyBorderImage {
+                minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+                source: "content/colors.png"; margin: 30
+                horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+            }
+
+            MyBorderImage {
+                minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+                source: "content/colors.png"; margin: 30
+                horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+            }
+
+            MyBorderImage {
+                minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+                source: "content/bw.png"; margin: 10
+            }
+
+            MyBorderImage {
+                minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+                source: "content/bw.png"; margin: 10
+                horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+            }
+
+            MyBorderImage {
+                minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+                source: "content/bw.png"; margin: 10
+                horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+            }
+
+            MyBorderImage {
+                minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+                source: "content/bw.png"; margin: 10
+                horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+            }
+        }
+    }
+}
diff --git a/examples/qtquick/imageelements/image.qml b/examples/qtquick/imageelements/image.qml
new file mode 100644 (file)
index 0000000..1595589
--- /dev/null
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "content"
+
+Rectangle {
+    width: 320
+    height: 480
+    Flickable {
+        anchors.fill: parent
+        contentWidth: 490
+        contentHeight: 285
+
+        Grid {
+            property int cellWidth: (width - (spacing * (columns - 1))) / columns
+            property int cellHeight: (height - (spacing * (rows - 1))) / rows
+
+            anchors.fill: parent
+            anchors.margins: 30
+
+            columns: 3
+            rows: 2
+            spacing: 30
+
+            ImageCell { mode: Image.Stretch; caption: "Stretch" }
+            ImageCell { mode: Image.PreserveAspectFit; caption: "PreserveAspectFit" }
+            ImageCell { mode: Image.PreserveAspectCrop; caption: "PreserveAspectCrop" }
+
+            ImageCell { mode: Image.Tile; caption: "Tile" }
+            ImageCell { mode: Image.TileHorizontally; caption: "TileHorizontally" }
+            ImageCell { mode: Image.TileVertically; caption: "TileVertically" }
+        }
+    }
+}
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared"
+import "../../shared"
 
 Item {
     height: 480
similarity index 99%
rename from examples/declarative/modelviews/modelviews.qml
rename to examples/qtquick/modelviews/modelviews.qml
index 86b10ca..f11608b 100644 (file)
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared"
+import "../../shared"
 
 Item {
     height: 480
@@ -73,4 +73,8 @@ Rectangle {
         model: visualModel.parts.grid
     }
     //![0]
+    Text {
+        anchors.bottom: parent.bottom
+        text: "Tap a delegate to move between views"
+    }
 }
diff --git a/examples/qtquick/modelviews/parallax/content/Clock.qml b/examples/qtquick/modelviews/parallax/content/Clock.qml
new file mode 100644 (file)
index 0000000..7f0e8cb
--- /dev/null
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Item {
+    id : clock
+    width: {
+        if (ListView.view && ListView.view.width >= 200)
+            return ListView.view.width / Math.floor(ListView.view.width / 200.0);
+        else
+            return 200;
+    }
+
+    height: {
+        if (ListView.view && ListView.view.height >= 240)
+            return ListView.view.height;
+        else
+            return 240;
+    }
+
+    property alias city: cityLabel.text
+    property int hours
+    property int minutes
+    property int seconds
+    property real shift
+    property bool night: false
+    property bool internationalTime: true //Unset for local time
+
+    function timeChanged() {
+        var date = new Date;
+        hours = internationalTime ? date.getUTCHours() + Math.floor(clock.shift) : date.getHours()
+        night = ( hours < 7 || hours > 19 )
+        minutes = internationalTime ? date.getUTCMinutes() + ((clock.shift % 1) * 60) : date.getMinutes()
+        seconds = date.getUTCSeconds();
+    }
+
+    Timer {
+        interval: 100; running: true; repeat: true;
+        onTriggered: clock.timeChanged()
+    }
+
+    Item {
+        anchors.centerIn: parent
+        width: 200; height: 240
+
+        Image { id: background; source: "clock.png"; visible: clock.night == false }
+        Image { source: "clock-night.png"; visible: clock.night == true }
+
+
+        Image {
+            x: 92.5; y: 27
+            source: "hour.png"
+            smooth: true
+            transform: Rotation {
+                id: hourRotation
+                origin.x: 7.5; origin.y: 73;
+                angle: (clock.hours * 30) + (clock.minutes * 0.5)
+                Behavior on angle {
+                    SpringAnimation { spring: 2; damping: 0.2; modulus: 360 }
+                }
+            }
+        }
+
+        Image {
+            x: 93.5; y: 17
+            source: "minute.png"
+            smooth: true
+            transform: Rotation {
+                id: minuteRotation
+                origin.x: 6.5; origin.y: 83;
+                angle: clock.minutes * 6
+                Behavior on angle {
+                    SpringAnimation { spring: 2; damping: 0.2; modulus: 360 }
+                }
+            }
+        }
+
+        Image {
+            x: 97.5; y: 20
+            source: "second.png"
+            smooth: true
+            transform: Rotation {
+                id: secondRotation
+                origin.x: 2.5; origin.y: 80;
+                angle: clock.seconds * 6
+                Behavior on angle {
+                    SpringAnimation { spring: 2; damping: 0.2; modulus: 360 }
+                }
+            }
+        }
+
+        Image {
+            anchors.centerIn: background; source: "center.png"
+        }
+
+        Text {
+            id: cityLabel
+            y: 210; anchors.horizontalCenter: parent.horizontalCenter
+            color: "white"
+            font.family: "Helvetica"
+            font.bold: true; font.pixelSize: 16
+            style: Text.Raised; styleColor: "black"
+        }
+    }
+}
diff --git a/examples/qtquick/modelviews/parallax/content/background.png b/examples/qtquick/modelviews/parallax/content/background.png
new file mode 100644 (file)
index 0000000..a885950
Binary files /dev/null and b/examples/qtquick/modelviews/parallax/content/background.png differ
diff --git a/examples/qtquick/modelviews/parallax/content/center.png b/examples/qtquick/modelviews/parallax/content/center.png
new file mode 100644 (file)
index 0000000..7fbd802
Binary files /dev/null and b/examples/qtquick/modelviews/parallax/content/center.png differ
diff --git a/examples/qtquick/modelviews/parallax/content/clock-night.png b/examples/qtquick/modelviews/parallax/content/clock-night.png
new file mode 100644 (file)
index 0000000..cc7151a
Binary files /dev/null and b/examples/qtquick/modelviews/parallax/content/clock-night.png differ
diff --git a/examples/qtquick/modelviews/parallax/content/clock.png b/examples/qtquick/modelviews/parallax/content/clock.png
new file mode 100644 (file)
index 0000000..462edac
Binary files /dev/null and b/examples/qtquick/modelviews/parallax/content/clock.png differ
diff --git a/examples/qtquick/modelviews/parallax/content/hour.png b/examples/qtquick/modelviews/parallax/content/hour.png
new file mode 100644 (file)
index 0000000..f8061a1
Binary files /dev/null and b/examples/qtquick/modelviews/parallax/content/hour.png differ
diff --git a/examples/qtquick/modelviews/parallax/content/minute.png b/examples/qtquick/modelviews/parallax/content/minute.png
new file mode 100644 (file)
index 0000000..1297ec7
Binary files /dev/null and b/examples/qtquick/modelviews/parallax/content/minute.png differ
diff --git a/examples/qtquick/modelviews/parallax/content/second.png b/examples/qtquick/modelviews/parallax/content/second.png
new file mode 100644 (file)
index 0000000..4aa9fb5
Binary files /dev/null and b/examples/qtquick/modelviews/parallax/content/second.png differ
@@ -39,7 +39,6 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../toys/clocks/content"  // for loading the Clock element
 import "content"
 
 Rectangle {
 import QtQuick 2.0
 
 Rectangle {
+    id: root
     color: "lightgray"
-    width: 240
-    height: 320
+    width: 320
+    height: 480
     property bool printDestruction: false
 
     VisualItemModel {
@@ -87,7 +88,7 @@ Rectangle {
     }
 
     Rectangle {
-        width: 240; height: 30
+        width: root.width; height: 30
         anchors { top: view.bottom; bottom: parent.bottom }
         color: "gray"
 
@@ -43,7 +43,10 @@ import "content"
 
 Rectangle {
     id: page
-    width: 420; height: 420
+    width: 320; height: 480
+    Flickable {
+        anchors.fill: parent
+    contentWidth: 420; contentHeight: 420
 
     Column {
         id: layout1
@@ -261,4 +264,5 @@ Rectangle {
         Rectangle { color: "red"; width: 80; height: 50; border.color: "black"; radius: 15 }
     }
 
+    }
 }
diff --git a/examples/qtquick/qtquick.pro b/examples/qtquick/qtquick.pro
new file mode 100644 (file)
index 0000000..2ffc377
--- /dev/null
@@ -0,0 +1,17 @@
+TEMPLATE = subdirs
+SUBDIRS = accessibility \
+            animation
+            #canvas \
+            #draganddrop \
+            #imageelements \
+            #keyinteraction \
+            #modelviews \
+            #mousearea \
+            #openglunderqml \
+            #painteditem \
+            #positioners \
+            #righttoleft \
+            #shadereffects \
+            #text \
+            #threading \
+            #touchinteraction
diff --git a/examples/qtquick/shadereffects/shadereffects.qml b/examples/qtquick/shadereffects/shadereffects.qml
new file mode 100644 (file)
index 0000000..70bcf13
--- /dev/null
@@ -0,0 +1,315 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the Declarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "content"
+
+Image {
+    width: 320
+    height: 480
+/*!
+    \title QML Examples - Shader Effects
+    \example declarative/shadereffects
+    \image qml-shadereffects-example.png
+    \brief This is a shader effects example
+
+    This example demonstrates a couple of visual effects that you can perform
+    with shaders in QtQuick 2.0
+*/
+    source: "../snake/content/pics/background.png"
+
+    Flickable {
+        anchors.fill: parent
+        contentWidth: 640
+        contentHeight: 360
+
+        ShaderEffectSource {
+            id: theSource
+            sourceItem: theItem
+            smooth: true
+        }
+
+        function saturate(x) {
+            return Math.min(Math.max(x, 0), 1)
+        }
+
+        function sliderToColor(x) {
+            return Qt.rgba(saturate(Math.max(2 - 6 * x, 6 * x - 4)),
+                            saturate(Math.min(6 * x, 4 - 6 * x)),
+                            saturate(Math.min(6 * x - 2, 6 - 6 * x)))
+        }
+
+        Grid {
+            anchors.centerIn: parent
+            columns: 3
+
+            Item {
+                id: theItem
+                width: 180
+                height: 180
+                ListView {
+                    anchors.centerIn: parent
+                    width: 160
+                    height: 140
+                    clip: true
+                    snapMode: ListView.SnapOneItem
+                    model: VisualItemModel {
+                        Text {
+                            width: 160
+                            height: 140
+                            horizontalAlignment: Text.AlignHCenter
+                            verticalAlignment: Text.AlignVCenter
+                            font.pixelSize: 120
+                            font.family: "Times"
+                            color: "blue"
+                            text: "Qt"
+                        }
+                        Image {
+                            width: 160
+                            height: 140
+                            source: "content/qt-logo.png"
+                            smooth: true
+                        }
+                        Image {
+                            width: 160
+                            height: 140
+                            source: "content/face-smile.png"
+                            smooth: true
+                        }
+                    }
+                }
+            }
+            ShaderEffect {
+                width: 180
+                height: 180
+                property variant source: theSource
+                property real amplitude: 0.04 * wobbleSlider.value
+                property real frequency: 20
+                property real time: 0
+                NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
+                fragmentShader:
+                    "uniform lowp float qt_Opacity;" +
+                    "uniform highp float amplitude;" +
+                    "uniform highp float frequency;" +
+                    "uniform highp float time;" +
+                    "uniform sampler2D source;" +
+                    "varying highp vec2 qt_TexCoord0;" +
+                    "void main() {" +
+                    "    highp vec2 p = sin(time + frequency * qt_TexCoord0);" +
+                    "    gl_FragColor = texture2D(source, qt_TexCoord0 + amplitude * vec2(p.y, -p.x)) * qt_Opacity;" +
+                    "}"
+                Slider {
+                    id: wobbleSlider
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    height: 40
+                }
+            }
+            ShaderEffect {
+                width: 180
+                height: 180
+                property variant source: theSource
+                property variant shadow: ShaderEffectSource {
+                    smooth: true
+                    sourceItem: ShaderEffect {
+                        width: theItem.width
+                        height: theItem.height
+                        property variant delta: Qt.size(0.0, 1.0 / height)
+                        property variant source: ShaderEffectSource {
+                            smooth: true
+                            sourceItem: ShaderEffect {
+                                width: theItem.width
+                                height: theItem.height
+                                property variant delta: Qt.size(1.0 / width, 0.0)
+                                property variant source: theSource
+                                fragmentShader: "
+                                    uniform lowp float qt_Opacity;
+                                    uniform sampler2D source;
+                                    uniform highp vec2 delta;
+                                    varying highp vec2 qt_TexCoord0;
+                                    void main() {
+                                        gl_FragColor =(0.0538 * texture2D(source, qt_TexCoord0 - 3.182 * delta)
+                                                     + 0.3229 * texture2D(source, qt_TexCoord0 - 1.364 * delta)
+                                                     + 0.2466 * texture2D(source, qt_TexCoord0)
+                                                     + 0.3229 * texture2D(source, qt_TexCoord0 + 1.364 * delta)
+                                                     + 0.0538 * texture2D(source, qt_TexCoord0 + 3.182 * delta)) * qt_Opacity;
+                                    }"
+                            }
+                        }
+                        fragmentShader: "
+                            uniform lowp float qt_Opacity;
+                            uniform sampler2D source;
+                            uniform highp vec2 delta;
+                            varying highp vec2 qt_TexCoord0;
+                            void main() {
+                                gl_FragColor =(0.0538 * texture2D(source, qt_TexCoord0 - 3.182 * delta)
+                                             + 0.3229 * texture2D(source, qt_TexCoord0 - 1.364 * delta)
+                                             + 0.2466 * texture2D(source, qt_TexCoord0)
+                                             + 0.3229 * texture2D(source, qt_TexCoord0 + 1.364 * delta)
+                                             + 0.0538 * texture2D(source, qt_TexCoord0 + 3.182 * delta)) * qt_Opacity;
+                            }"
+                    }
+                }
+                property real angle: 0
+                property variant offset: Qt.point(15.0 * Math.cos(angle), 15.0 * Math.sin(angle))
+                NumberAnimation on angle { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 6000 }
+                property variant delta: Qt.size(offset.x / width, offset.y / height)
+                property real darkness: shadowSlider.value
+                fragmentShader: "
+                    uniform lowp float qt_Opacity;
+                    uniform highp vec2 offset;
+                    uniform sampler2D source;
+                    uniform sampler2D shadow;
+                    uniform highp float darkness;
+                    uniform highp vec2 delta;
+                    varying highp vec2 qt_TexCoord0;
+                    void main() {
+                        lowp vec4 fg = texture2D(source, qt_TexCoord0);
+                        lowp vec4 bg = texture2D(shadow, qt_TexCoord0 + delta);
+                        gl_FragColor = (fg + vec4(0., 0., 0., darkness * bg.a) * (1. - fg.a)) * qt_Opacity;
+                    }"
+                Slider {
+                    id: shadowSlider
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    height: 40
+                }
+            }
+            ShaderEffect {
+                width: 180
+                height: 180
+                property variant source: theSource
+                property variant delta: Qt.size(0.5 / width, 0.5 / height)
+                fragmentShader: "
+                    uniform sampler2D source;
+                    uniform highp vec2 delta;
+                    uniform highp float qt_Opacity;
+                    varying highp vec2 qt_TexCoord0;
+                    void main() {
+                        lowp vec4 tl = texture2D(source, qt_TexCoord0 - delta);
+                        lowp vec4 tr = texture2D(source, qt_TexCoord0 + vec2(delta.x, -delta.y));
+                        lowp vec4 bl = texture2D(source, qt_TexCoord0 - vec2(delta.x, -delta.y));
+                        lowp vec4 br = texture2D(source, qt_TexCoord0 + delta);
+                        lowp vec4 gx = (tl + bl) - (tr + br);
+                        lowp vec4 gy = (tl + tr) - (bl + br);
+                        gl_FragColor.xyz = vec3(0.);
+                        gl_FragColor.w = clamp(dot(sqrt(gx * gx + gy * gy), vec4(1.)), 0., 1.) * qt_Opacity;
+                    }"
+            }
+            ShaderEffect {
+                width: 180
+                height: 180
+                property variant source: theSource
+                property color tint: sliderToColor(colorizeSlider.value)
+                fragmentShader: "
+                    uniform sampler2D source;
+                    uniform lowp vec4 tint;
+                    uniform lowp float qt_Opacity;
+                    varying highp vec2 qt_TexCoord0;
+                    void main() {
+                        lowp vec4 c = texture2D(source, qt_TexCoord0);
+                        lowp float lo = min(min(c.x, c.y), c.z);
+                        lowp float hi = max(max(c.x, c.y), c.z);
+                        gl_FragColor = qt_Opacity * vec4(mix(vec3(lo), vec3(hi), tint.xyz), c.w);
+                    }"
+                Slider {
+                    id: colorizeSlider
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    height: 40
+                }
+            }
+            ShaderEffect {
+                width: 180
+                height: 180
+                mesh: Qt.size(10, 10)
+                property variant source: theSource
+                property real bend: 0
+                property real minimize: 0
+                property real side: genieSlider.value
+                SequentialAnimation on bend {
+                    loops: Animation.Infinite
+                    NumberAnimation { to: 1; duration: 700; easing.type: Easing.InOutSine }
+                    PauseAnimation { duration: 1600 }
+                    NumberAnimation { to: 0; duration: 700; easing.type: Easing.InOutSine }
+                    PauseAnimation { duration: 1000 }
+                }
+                SequentialAnimation on minimize {
+                    loops: Animation.Infinite
+                    PauseAnimation { duration: 300 }
+                    NumberAnimation { to: 1; duration: 700; easing.type: Easing.InOutSine }
+                    PauseAnimation { duration: 1000 }
+                    NumberAnimation { to: 0; duration: 700; easing.type: Easing.InOutSine }
+                    PauseAnimation { duration: 1300 }
+                }
+                vertexShader: "
+                    uniform highp mat4 qt_Matrix;
+                    uniform highp float bend;
+                    uniform highp float minimize;
+                    uniform highp float side;
+                    uniform highp float width;
+                    uniform highp float height;
+                    attribute highp vec4 qt_Vertex;
+                    attribute highp vec2 qt_MultiTexCoord0;
+                    varying highp vec2 qt_TexCoord0;
+                    void main() {
+                        qt_TexCoord0 = qt_MultiTexCoord0;
+                        highp vec4 pos = qt_Vertex;
+                        pos.y = mix(qt_Vertex.y, height, minimize);
+                        highp float t = pos.y / height;
+                        t = (3. - 2. * t) * t * t;
+                        pos.x = mix(qt_Vertex.x, side * width, t * bend);
+                        gl_Position = qt_Matrix * pos;
+                    }"
+                Slider {
+                    id: genieSlider
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    height: 40
+                }
+            }
+        }
+    }
+}
similarity index 99%
rename from examples/declarative/text/text.qml
rename to examples/qtquick/text/text.qml
index 14a88d2..9bfd290 100644 (file)
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared"
+import "../../shared"
 
 Item {
     height: 480
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared"
+import "../../shared"
 
 Item {
     height: 480
@@ -48,7 +48,6 @@ Item {
         id: ll
         anchors.fill: parent
         Component.onCompleted: {
-            addExample("MouseArea", "Using the basic touch input element", Qt.resolvedUrl("mousearea/mousearea-example.qml"));
             addExample("Multipoint Flames", "Create multiple flames with multiple fingers", Qt.resolvedUrl("multipointtouch/multiflame.qml"));
             addExample("Bear-Whack", "Use multiple touches to knock all the bears down",  Qt.resolvedUrl("multipointtouch/bearwhack.qml"));
             addExample("Flick Resize", "Manipulate images using pinch gestures", Qt.resolvedUrl("pincharea/flickresize.qml"));
similarity index 97%
rename from examples/declarative/shared/LauncherList.qml
rename to examples/shared/LauncherList.qml
index 782fcc7..492290d 100644 (file)
@@ -89,11 +89,12 @@ ListView {
             //Eats mouse events
         }
         Image {
-            source: "back.png"
+            source: "images/back.png"
             anchors.verticalCenter: parent.verticalCenter
             x: 4
             MouseArea {
                 anchors.fill: parent
+                anchors.margins: -10
                 onClicked: ei.exampleUrl = "";
             }
         }
diff --git a/examples/shared/qmldir b/examples/shared/qmldir
new file mode 100644 (file)
index 0000000..2f1e56a
--- /dev/null
@@ -0,0 +1,3 @@
+Button 2.0 Button.qml
+LauncherList 2.0 LauncherList.qml
+SimpleLauncherDelegate 2.0 SimpleLauncherDelegate.qml
diff --git a/examples/shared/shared.h b/examples/shared/shared.h
new file mode 100644 (file)
index 0000000..e6d0130
--- /dev/null
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QGuiApplication>
+#include <QQuickView>
+#define DECLARATIVE_EXAMPLE_MAIN(NAME) int main(int argc, char* argv[]) \
+{\
+    QGuiApplication app(argc,argv);\
+    QQuickView view;\
+    view.setSource(QUrl::fromLocalFile(#NAME ".qml"));\
+    view.show();\
+    return app.exec();\
+}
diff --git a/examples/shared/shared.pro b/examples/shared/shared.pro
new file mode 100644 (file)
index 0000000..d6ce120
--- /dev/null
@@ -0,0 +1,9 @@
+#just install the files, all QML for now
+TEMPLATE = aux
+
+qml.files = images \
+            LauncherList.qml \
+            SimpleLauncherDelegate.qml \
+            Button.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/shared
+INSTALLS = qml
diff --git a/examples/tutorials/ui-components/dialcontrol/content/QuitButton.qml b/examples/tutorials/ui-components/dialcontrol/content/QuitButton.qml
new file mode 100644 (file)
index 0000000..702b892
--- /dev/null
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+Image {
+    source: "quit.png"
+    scale: quitMouse.pressed ? 0.8 : 1.0
+    smooth: quitMouse.pressed
+    MouseArea {
+        id: quitMouse
+        anchors.fill: parent
+        anchors.margins: -10
+        onClicked: Qt.quit()
+    }
+}
diff --git a/examples/tutorials/ui-components/dialcontrol/content/quit.png b/examples/tutorials/ui-components/dialcontrol/content/quit.png
new file mode 100644 (file)
index 0000000..b822057
Binary files /dev/null and b/examples/tutorials/ui-components/dialcontrol/content/quit.png differ
index 0e420f7..ce8f214 100644 (file)
@@ -89,32 +89,25 @@ tst_examples::tst_examples()
     excludedFiles << "doc/src/snippets/declarative/listmodel.qml"; //Just a ListModel, no root QQuickItem
 
     // Add directories you want excluded here
-    excludedDirs << "examples/declarative/text/fonts"; // QTBUG-21415
+    excludedDirs << "examples/shared"; //Not an example
+    excludedDirs << "examples/qtquick/text/fonts"; // QTBUG-21415
     excludedDirs << "doc/src/snippets/declarative/path"; //No root QQuickItem
 
-    // Not run in QQuickView
-    excludedDirs << "examples/declarative/qtquick1";
-
     // These snippets are not expected to run on their own.
     excludedDirs << "doc/src/snippets/declarative/visualdatamodel_rootindex";
     excludedDirs << "doc/src/snippets/declarative/qtbinding";
     excludedDirs << "doc/src/snippets/declarative/imports";
-    excludedDirs << "doc/src/snippets/qtquick1/visualdatamodel_rootindex";
-    excludedDirs << "doc/src/snippets/qtquick1/qtbinding";
-    excludedDirs << "doc/src/snippets/qtquick1/imports";
 
 #ifdef QT_NO_WEBKIT
-    excludedDirs << "examples/declarative/modelviews/webview";
-    excludedDirs << "examples/declarative/webbrowser";
+    excludedDirs << "examples/qtquick/modelviews/webview";
+    excludedDirs << "examples/demos/webbrowser";
     excludedDirs << "doc/src/snippets/declarative/webview";
-    excludedDirs << "doc/src/snippets/qtquick1/webview";
 #endif
 
 #ifdef QT_NO_XMLPATTERNS
-    excludedDirs << "examples/declarative/xml/xmldata";
-    excludedDirs << "examples/declarative/twitter";
-    excludedDirs << "examples/declarative/flickr";
-    excludedDirs << "examples/declarative/photoviewer";
+    excludedDirs << "examples/demos/twitter";
+    excludedDirs << "examples/demos/flickr";
+    excludedDirs << "examples/demos/photoviewer";
 #endif
 }
 
@@ -230,12 +223,10 @@ void tst_examples::sgexamples_data()
 {
     QTest::addColumn<QString>("file");
 
-    QString examples = QLatin1String(SRCDIR) + "/../../../../examples/declarative/";
-    QString tutorials = QLatin1String(SRCDIR) + "/../../../../examples/tutorials/"; //Only declarative tutorials since modularization
+    QString examples = QLatin1String(SRCDIR) + "/../../../../examples/";
 
     QStringList files;
     files << findQmlFiles(QDir(examples));
-    files << findQmlFiles(QDir(tutorials));
 
     foreach (const QString &file, files)
         QTest::newRow(qPrintable(file)) << file;