diff --git a/demos/declarative/declarative.pro b/demos/declarative/declarative.pro
deleted file mode 100644
index 561832c3477c21a03c5aa263b5dcb58a93a38779..0000000000000000000000000000000000000000
--- a/demos/declarative/declarative.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TEMPLATE = subdirs
-
-# These demos contain C++ and need to be compiled
-SUBDIRS = \
- minehunt
-
-# These examples contain no C++ and can simply be copied
-sources.files = \
- calculator \
- flickr \
- photoviewer \
- samegame \
- snake \
- twitter \
- rssnews \
- webbrowser
-
-sources.path = $$[QT_INSTALL_DEMOS]/qtdeclarative/declarative
-INSTALLS += sources
-
diff --git a/demos/declarative/demos.qmlproject b/demos/declarative/demos.qmlproject
deleted file mode 100644
index d4909f86850891f46c95670d76345c4ecee3adbe..0000000000000000000000000000000000000000
--- a/demos/declarative/demos.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
- /* Include .qml, .js, and image files from current directory and subdirectories */
- QmlFiles {
- directory: "."
- }
- JavaScriptFiles {
- directory: "."
- }
- ImageFiles {
- directory: "."
- }
- /* List of plugin directories passed to QML runtime */
- // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/demos/demos.pro b/demos/demos.pro
deleted file mode 100644
index 09881f1a9c0f6912d0b209a308fcef36f8d50e75..0000000000000000000000000000000000000000
--- a/demos/demos.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += declarative
diff --git a/demos/declarative/calculator/Core/Button.qml b/examples/declarative/calculator/Core/Button.qml
similarity index 100%
rename from demos/declarative/calculator/Core/Button.qml
rename to examples/declarative/calculator/Core/Button.qml
diff --git a/demos/declarative/calculator/Core/Display.qml b/examples/declarative/calculator/Core/Display.qml
similarity index 100%
rename from demos/declarative/calculator/Core/Display.qml
rename to examples/declarative/calculator/Core/Display.qml
diff --git a/demos/declarative/calculator/Core/calculator.js b/examples/declarative/calculator/Core/calculator.js
similarity index 100%
rename from demos/declarative/calculator/Core/calculator.js
rename to examples/declarative/calculator/Core/calculator.js
diff --git a/demos/declarative/calculator/Core/images/button-.png b/examples/declarative/calculator/Core/images/button-.png
similarity index 100%
rename from demos/declarative/calculator/Core/images/button-.png
rename to examples/declarative/calculator/Core/images/button-.png
diff --git a/demos/declarative/calculator/Core/images/button-blue.png b/examples/declarative/calculator/Core/images/button-blue.png
similarity index 100%
rename from demos/declarative/calculator/Core/images/button-blue.png
rename to examples/declarative/calculator/Core/images/button-blue.png
diff --git a/demos/declarative/calculator/Core/images/button-green.png b/examples/declarative/calculator/Core/images/button-green.png
similarity index 100%
rename from demos/declarative/calculator/Core/images/button-green.png
rename to examples/declarative/calculator/Core/images/button-green.png
diff --git a/demos/declarative/calculator/Core/images/button-purple.png b/examples/declarative/calculator/Core/images/button-purple.png
similarity index 100%
rename from demos/declarative/calculator/Core/images/button-purple.png
rename to examples/declarative/calculator/Core/images/button-purple.png
diff --git a/demos/declarative/calculator/Core/images/button-red.png b/examples/declarative/calculator/Core/images/button-red.png
similarity index 100%
rename from demos/declarative/calculator/Core/images/button-red.png
rename to examples/declarative/calculator/Core/images/button-red.png
diff --git a/demos/declarative/calculator/Core/images/display.png b/examples/declarative/calculator/Core/images/display.png
similarity index 100%
rename from demos/declarative/calculator/Core/images/display.png
rename to examples/declarative/calculator/Core/images/display.png
diff --git a/demos/declarative/calculator/Core/qmldir b/examples/declarative/calculator/Core/qmldir
similarity index 100%
rename from demos/declarative/calculator/Core/qmldir
rename to examples/declarative/calculator/Core/qmldir
diff --git a/demos/declarative/calculator/calculator.qml b/examples/declarative/calculator/calculator.qml
similarity index 100%
rename from demos/declarative/calculator/calculator.qml
rename to examples/declarative/calculator/calculator.qml
diff --git a/demos/declarative/calculator/calculator.qmlproject b/examples/declarative/calculator/calculator.qmlproject
similarity index 100%
rename from demos/declarative/calculator/calculator.qmlproject
rename to examples/declarative/calculator/calculator.qmlproject
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index cbeb7e9e26cf59ee6cac17b3f07573316fcb214e..c2950616a2012dadbe1d317b97e6a2928956654a 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -3,9 +3,10 @@ TEMPLATE = subdirs
# These examples contain some C++ and need to be built
SUBDIRS = \
cppextensions \
+ minehunt \
modelviews \
- tutorials \
- painteditem
+ painteditem \
+ tutorials
# plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name
symbian:SUBDIRS -= plugins
@@ -13,18 +14,27 @@ symbian:SUBDIRS -= plugins
# These examples contain no C++ and can simply be copied
sources.files = \
animation \
+ calculator \
cppextensions \
+ flickr \
i18n \
imageelements \
keyinteraction \
+ photoviewer \
positioners \
+ rssnews \
+ samegame \
+ snake \
sqllocalstorage \
text \
threading \
touchinteraction \
toys \
+ twitter \
ui-components \
+ webbrowser \
xml
+
sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative
INSTALLS += sources
diff --git a/demos/declarative/flickr/content/Button.qml b/examples/declarative/flickr/content/Button.qml
similarity index 100%
rename from demos/declarative/flickr/content/Button.qml
rename to examples/declarative/flickr/content/Button.qml
diff --git a/demos/declarative/flickr/content/GridDelegate.qml b/examples/declarative/flickr/content/GridDelegate.qml
similarity index 100%
rename from demos/declarative/flickr/content/GridDelegate.qml
rename to examples/declarative/flickr/content/GridDelegate.qml
diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/examples/declarative/flickr/content/ImageDetails.qml
similarity index 100%
rename from demos/declarative/flickr/content/ImageDetails.qml
rename to examples/declarative/flickr/content/ImageDetails.qml
diff --git a/demos/declarative/flickr/content/ListDelegate.qml b/examples/declarative/flickr/content/ListDelegate.qml
similarity index 100%
rename from demos/declarative/flickr/content/ListDelegate.qml
rename to examples/declarative/flickr/content/ListDelegate.qml
diff --git a/demos/declarative/flickr/content/Progress.qml b/examples/declarative/flickr/content/Progress.qml
similarity index 100%
rename from demos/declarative/flickr/content/Progress.qml
rename to examples/declarative/flickr/content/Progress.qml
diff --git a/demos/declarative/flickr/content/RssModel.qml b/examples/declarative/flickr/content/RssModel.qml
similarity index 100%
rename from demos/declarative/flickr/content/RssModel.qml
rename to examples/declarative/flickr/content/RssModel.qml
diff --git a/demos/declarative/flickr/content/ScrollBar.qml b/examples/declarative/flickr/content/ScrollBar.qml
similarity index 100%
rename from demos/declarative/flickr/content/ScrollBar.qml
rename to examples/declarative/flickr/content/ScrollBar.qml
diff --git a/demos/declarative/flickr/content/Slider.qml b/examples/declarative/flickr/content/Slider.qml
similarity index 100%
rename from demos/declarative/flickr/content/Slider.qml
rename to examples/declarative/flickr/content/Slider.qml
diff --git a/demos/declarative/flickr/content/StreamView.qml b/examples/declarative/flickr/content/StreamView.qml
similarity index 100%
rename from demos/declarative/flickr/content/StreamView.qml
rename to examples/declarative/flickr/content/StreamView.qml
diff --git a/demos/declarative/flickr/content/TitleBar.qml b/examples/declarative/flickr/content/TitleBar.qml
similarity index 100%
rename from demos/declarative/flickr/content/TitleBar.qml
rename to examples/declarative/flickr/content/TitleBar.qml
diff --git a/demos/declarative/flickr/content/ToolBar.qml b/examples/declarative/flickr/content/ToolBar.qml
similarity index 100%
rename from demos/declarative/flickr/content/ToolBar.qml
rename to examples/declarative/flickr/content/ToolBar.qml
diff --git a/demos/declarative/flickr/content/UnifiedDelegate.qml b/examples/declarative/flickr/content/UnifiedDelegate.qml
similarity index 100%
rename from demos/declarative/flickr/content/UnifiedDelegate.qml
rename to examples/declarative/flickr/content/UnifiedDelegate.qml
diff --git a/demos/declarative/flickr/content/images/gloss.png b/examples/declarative/flickr/content/images/gloss.png
similarity index 100%
rename from demos/declarative/flickr/content/images/gloss.png
rename to examples/declarative/flickr/content/images/gloss.png
diff --git a/demos/declarative/flickr/content/images/lineedit.png b/examples/declarative/flickr/content/images/lineedit.png
similarity index 100%
rename from demos/declarative/flickr/content/images/lineedit.png
rename to examples/declarative/flickr/content/images/lineedit.png
diff --git a/demos/declarative/flickr/content/images/lineedit.sci b/examples/declarative/flickr/content/images/lineedit.sci
similarity index 100%
rename from demos/declarative/flickr/content/images/lineedit.sci
rename to examples/declarative/flickr/content/images/lineedit.sci
diff --git a/demos/declarative/flickr/content/images/noise.png b/examples/declarative/flickr/content/images/noise.png
similarity index 100%
rename from demos/declarative/flickr/content/images/noise.png
rename to examples/declarative/flickr/content/images/noise.png
diff --git a/demos/declarative/flickr/content/images/particle.png b/examples/declarative/flickr/content/images/particle.png
similarity index 100%
rename from demos/declarative/flickr/content/images/particle.png
rename to examples/declarative/flickr/content/images/particle.png
diff --git a/demos/declarative/flickr/content/images/quit.png b/examples/declarative/flickr/content/images/quit.png
similarity index 100%
rename from demos/declarative/flickr/content/images/quit.png
rename to examples/declarative/flickr/content/images/quit.png
diff --git a/demos/declarative/flickr/content/images/squareParticle.png b/examples/declarative/flickr/content/images/squareParticle.png
similarity index 100%
rename from demos/declarative/flickr/content/images/squareParticle.png
rename to examples/declarative/flickr/content/images/squareParticle.png
diff --git a/demos/declarative/flickr/content/images/stripes.png b/examples/declarative/flickr/content/images/stripes.png
similarity index 100%
rename from demos/declarative/flickr/content/images/stripes.png
rename to examples/declarative/flickr/content/images/stripes.png
diff --git a/demos/declarative/flickr/content/images/titlebar.png b/examples/declarative/flickr/content/images/titlebar.png
similarity index 100%
rename from demos/declarative/flickr/content/images/titlebar.png
rename to examples/declarative/flickr/content/images/titlebar.png
diff --git a/demos/declarative/flickr/content/images/titlebar.sci b/examples/declarative/flickr/content/images/titlebar.sci
similarity index 100%
rename from demos/declarative/flickr/content/images/titlebar.sci
rename to examples/declarative/flickr/content/images/titlebar.sci
diff --git a/demos/declarative/flickr/content/images/toolbutton.png b/examples/declarative/flickr/content/images/toolbutton.png
similarity index 100%
rename from demos/declarative/flickr/content/images/toolbutton.png
rename to examples/declarative/flickr/content/images/toolbutton.png
diff --git a/demos/declarative/flickr/content/images/toolbutton.sci b/examples/declarative/flickr/content/images/toolbutton.sci
similarity index 100%
rename from demos/declarative/flickr/content/images/toolbutton.sci
rename to examples/declarative/flickr/content/images/toolbutton.sci
diff --git a/demos/declarative/flickr/content/qmldir b/examples/declarative/flickr/content/qmldir
similarity index 100%
rename from demos/declarative/flickr/content/qmldir
rename to examples/declarative/flickr/content/qmldir
diff --git a/demos/declarative/flickr/flickr-90.qml b/examples/declarative/flickr/flickr-90.qml
similarity index 100%
rename from demos/declarative/flickr/flickr-90.qml
rename to examples/declarative/flickr/flickr-90.qml
diff --git a/demos/declarative/flickr/flickr.qml b/examples/declarative/flickr/flickr.qml
similarity index 100%
rename from demos/declarative/flickr/flickr.qml
rename to examples/declarative/flickr/flickr.qml
diff --git a/demos/declarative/flickr/flickr.qmlproject b/examples/declarative/flickr/flickr.qmlproject
similarity index 100%
rename from demos/declarative/flickr/flickr.qmlproject
rename to examples/declarative/flickr/flickr.qmlproject
diff --git a/demos/declarative/minehunt/MinehuntCore/Explosion.qml b/examples/declarative/minehunt/MinehuntCore/Explosion.qml
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/Explosion.qml
rename to examples/declarative/minehunt/MinehuntCore/Explosion.qml
diff --git a/demos/declarative/minehunt/MinehuntCore/Tile.qml b/examples/declarative/minehunt/MinehuntCore/Tile.qml
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/Tile.qml
rename to examples/declarative/minehunt/MinehuntCore/Tile.qml
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/back.png b/examples/declarative/minehunt/MinehuntCore/pics/back.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/back.png
rename to examples/declarative/minehunt/MinehuntCore/pics/back.png
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/background.png b/examples/declarative/minehunt/MinehuntCore/pics/background.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/background.png
rename to examples/declarative/minehunt/MinehuntCore/pics/background.png
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/bomb-color.png b/examples/declarative/minehunt/MinehuntCore/pics/bomb-color.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/bomb-color.png
rename to examples/declarative/minehunt/MinehuntCore/pics/bomb-color.png
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/bomb.png b/examples/declarative/minehunt/MinehuntCore/pics/bomb.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/bomb.png
rename to examples/declarative/minehunt/MinehuntCore/pics/bomb.png
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/face-sad.png b/examples/declarative/minehunt/MinehuntCore/pics/face-sad.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/face-sad.png
rename to examples/declarative/minehunt/MinehuntCore/pics/face-sad.png
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/face-smile-big.png b/examples/declarative/minehunt/MinehuntCore/pics/face-smile-big.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/face-smile-big.png
rename to examples/declarative/minehunt/MinehuntCore/pics/face-smile-big.png
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/face-smile.png b/examples/declarative/minehunt/MinehuntCore/pics/face-smile.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/face-smile.png
rename to examples/declarative/minehunt/MinehuntCore/pics/face-smile.png
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/flag-color.png b/examples/declarative/minehunt/MinehuntCore/pics/flag-color.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/flag-color.png
rename to examples/declarative/minehunt/MinehuntCore/pics/flag-color.png
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/flag.png b/examples/declarative/minehunt/MinehuntCore/pics/flag.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/flag.png
rename to examples/declarative/minehunt/MinehuntCore/pics/flag.png
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/front.png b/examples/declarative/minehunt/MinehuntCore/pics/front.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/front.png
rename to examples/declarative/minehunt/MinehuntCore/pics/front.png
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/quit.png b/examples/declarative/minehunt/MinehuntCore/pics/quit.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/quit.png
rename to examples/declarative/minehunt/MinehuntCore/pics/quit.png
diff --git a/demos/declarative/minehunt/MinehuntCore/pics/star.png b/examples/declarative/minehunt/MinehuntCore/pics/star.png
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/pics/star.png
rename to examples/declarative/minehunt/MinehuntCore/pics/star.png
diff --git a/demos/declarative/minehunt/MinehuntCore/qmldir b/examples/declarative/minehunt/MinehuntCore/qmldir
similarity index 100%
rename from demos/declarative/minehunt/MinehuntCore/qmldir
rename to examples/declarative/minehunt/MinehuntCore/qmldir
diff --git a/demos/declarative/minehunt/README b/examples/declarative/minehunt/README
similarity index 100%
rename from demos/declarative/minehunt/README
rename to examples/declarative/minehunt/README
diff --git a/demos/declarative/minehunt/main.cpp b/examples/declarative/minehunt/main.cpp
similarity index 100%
rename from demos/declarative/minehunt/main.cpp
rename to examples/declarative/minehunt/main.cpp
diff --git a/demos/declarative/minehunt/minehunt.cpp b/examples/declarative/minehunt/minehunt.cpp
similarity index 100%
rename from demos/declarative/minehunt/minehunt.cpp
rename to examples/declarative/minehunt/minehunt.cpp
diff --git a/demos/declarative/minehunt/minehunt.h b/examples/declarative/minehunt/minehunt.h
similarity index 100%
rename from demos/declarative/minehunt/minehunt.h
rename to examples/declarative/minehunt/minehunt.h
diff --git a/demos/declarative/minehunt/minehunt.pro b/examples/declarative/minehunt/minehunt.pro
similarity index 100%
rename from demos/declarative/minehunt/minehunt.pro
rename to examples/declarative/minehunt/minehunt.pro
diff --git a/demos/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml
similarity index 100%
rename from demos/declarative/minehunt/minehunt.qml
rename to examples/declarative/minehunt/minehunt.qml
diff --git a/demos/declarative/minehunt/minehunt.qmlproject b/examples/declarative/minehunt/minehunt.qmlproject
similarity index 100%
rename from demos/declarative/minehunt/minehunt.qmlproject
rename to examples/declarative/minehunt/minehunt.qmlproject
diff --git a/demos/declarative/minehunt/minehunt.qrc b/examples/declarative/minehunt/minehunt.qrc
similarity index 100%
rename from demos/declarative/minehunt/minehunt.qrc
rename to examples/declarative/minehunt/minehunt.qrc
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
rename to examples/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
rename to examples/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/Button.qml b/examples/declarative/photoviewer/PhotoViewerCore/Button.qml
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/Button.qml
rename to examples/declarative/photoviewer/PhotoViewerCore/Button.qml
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
rename to examples/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
rename to examples/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
rename to examples/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml b/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml
rename to examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml b/examples/declarative/photoviewer/PhotoViewerCore/Tag.qml
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/Tag.qml
rename to examples/declarative/photoviewer/PhotoViewerCore/Tag.qml
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png
rename to examples/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/images/busy.png b/examples/declarative/photoviewer/PhotoViewerCore/images/busy.png
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/images/busy.png
rename to examples/declarative/photoviewer/PhotoViewerCore/images/busy.png
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/declarative/photoviewer/PhotoViewerCore/images/cardboard.png
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/images/cardboard.png
rename to examples/declarative/photoviewer/PhotoViewerCore/images/cardboard.png
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/qmldir b/examples/declarative/photoviewer/PhotoViewerCore/qmldir
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/qmldir
rename to examples/declarative/photoviewer/PhotoViewerCore/qmldir
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/script/script.js b/examples/declarative/photoviewer/PhotoViewerCore/script/script.js
similarity index 100%
rename from demos/declarative/photoviewer/PhotoViewerCore/script/script.js
rename to examples/declarative/photoviewer/PhotoViewerCore/script/script.js
diff --git a/demos/declarative/photoviewer/i18n/base.ts b/examples/declarative/photoviewer/i18n/base.ts
similarity index 100%
rename from demos/declarative/photoviewer/i18n/base.ts
rename to examples/declarative/photoviewer/i18n/base.ts
diff --git a/demos/declarative/photoviewer/i18n/qml_fr.qm b/examples/declarative/photoviewer/i18n/qml_fr.qm
similarity index 100%
rename from demos/declarative/photoviewer/i18n/qml_fr.qm
rename to examples/declarative/photoviewer/i18n/qml_fr.qm
diff --git a/demos/declarative/photoviewer/i18n/qml_fr.ts b/examples/declarative/photoviewer/i18n/qml_fr.ts
similarity index 100%
rename from demos/declarative/photoviewer/i18n/qml_fr.ts
rename to examples/declarative/photoviewer/i18n/qml_fr.ts
diff --git a/demos/declarative/photoviewer/photoviewer.qml b/examples/declarative/photoviewer/photoviewer.qml
similarity index 100%
rename from demos/declarative/photoviewer/photoviewer.qml
rename to examples/declarative/photoviewer/photoviewer.qml
diff --git a/demos/declarative/photoviewer/photoviewer.qmlproject b/examples/declarative/photoviewer/photoviewer.qmlproject
similarity index 100%
rename from demos/declarative/photoviewer/photoviewer.qmlproject
rename to examples/declarative/photoviewer/photoviewer.qmlproject
diff --git a/demos/declarative/plasmapatrol/PlasmaPatrol.qmlproject b/examples/declarative/plasmapatrol/PlasmaPatrol.qmlproject
similarity index 100%
rename from demos/declarative/plasmapatrol/PlasmaPatrol.qmlproject
rename to examples/declarative/plasmapatrol/PlasmaPatrol.qmlproject
diff --git a/demos/declarative/plasmapatrol/TODO b/examples/declarative/plasmapatrol/TODO
similarity index 100%
rename from demos/declarative/plasmapatrol/TODO
rename to examples/declarative/plasmapatrol/TODO
diff --git a/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml b/examples/declarative/plasmapatrol/content/BlasterHardpoint.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/BlasterHardpoint.qml
rename to examples/declarative/plasmapatrol/content/BlasterHardpoint.qml
diff --git a/demos/declarative/plasmapatrol/content/Button.qml b/examples/declarative/plasmapatrol/content/Button.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/Button.qml
rename to examples/declarative/plasmapatrol/content/Button.qml
diff --git a/demos/declarative/plasmapatrol/content/CannonHardpoint.qml b/examples/declarative/plasmapatrol/content/CannonHardpoint.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/CannonHardpoint.qml
rename to examples/declarative/plasmapatrol/content/CannonHardpoint.qml
diff --git a/demos/declarative/plasmapatrol/content/ChoiceBox.qml b/examples/declarative/plasmapatrol/content/ChoiceBox.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/ChoiceBox.qml
rename to examples/declarative/plasmapatrol/content/ChoiceBox.qml
diff --git a/demos/declarative/plasmapatrol/content/Cruiser.qml b/examples/declarative/plasmapatrol/content/Cruiser.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/Cruiser.qml
rename to examples/declarative/plasmapatrol/content/Cruiser.qml
diff --git a/demos/declarative/plasmapatrol/content/Frigate.qml b/examples/declarative/plasmapatrol/content/Frigate.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/Frigate.qml
rename to examples/declarative/plasmapatrol/content/Frigate.qml
diff --git a/demos/declarative/plasmapatrol/content/Hardpoint.qml b/examples/declarative/plasmapatrol/content/Hardpoint.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/Hardpoint.qml
rename to examples/declarative/plasmapatrol/content/Hardpoint.qml
diff --git a/demos/declarative/plasmapatrol/content/HelpScreens.qml b/examples/declarative/plasmapatrol/content/HelpScreens.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/HelpScreens.qml
rename to examples/declarative/plasmapatrol/content/HelpScreens.qml
diff --git a/demos/declarative/plasmapatrol/content/LaserHardpoint.qml b/examples/declarative/plasmapatrol/content/LaserHardpoint.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/LaserHardpoint.qml
rename to examples/declarative/plasmapatrol/content/LaserHardpoint.qml
diff --git a/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml b/examples/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml
rename to examples/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml
diff --git a/demos/declarative/plasmapatrol/content/SequentialLoader.qml b/examples/declarative/plasmapatrol/content/SequentialLoader.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/SequentialLoader.qml
rename to examples/declarative/plasmapatrol/content/SequentialLoader.qml
diff --git a/demos/declarative/plasmapatrol/content/Ship.qml b/examples/declarative/plasmapatrol/content/Ship.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/Ship.qml
rename to examples/declarative/plasmapatrol/content/Ship.qml
diff --git a/demos/declarative/plasmapatrol/content/Sloop.qml b/examples/declarative/plasmapatrol/content/Sloop.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/content/Sloop.qml
rename to examples/declarative/plasmapatrol/content/Sloop.qml
diff --git a/demos/declarative/plasmapatrol/content/pics/TitleText.png b/examples/declarative/plasmapatrol/content/pics/TitleText.png
similarity index 100%
rename from demos/declarative/plasmapatrol/content/pics/TitleText.png
rename to examples/declarative/plasmapatrol/content/pics/TitleText.png
diff --git a/demos/declarative/plasmapatrol/content/pics/blur-circle2.png b/examples/declarative/plasmapatrol/content/pics/blur-circle2.png
similarity index 100%
rename from demos/declarative/plasmapatrol/content/pics/blur-circle2.png
rename to examples/declarative/plasmapatrol/content/pics/blur-circle2.png
diff --git a/demos/declarative/plasmapatrol/content/pics/blur-circle3.png b/examples/declarative/plasmapatrol/content/pics/blur-circle3.png
similarity index 100%
rename from demos/declarative/plasmapatrol/content/pics/blur-circle3.png
rename to examples/declarative/plasmapatrol/content/pics/blur-circle3.png
diff --git a/demos/declarative/plasmapatrol/content/pics/finalfrontier.png b/examples/declarative/plasmapatrol/content/pics/finalfrontier.png
similarity index 100%
rename from demos/declarative/plasmapatrol/content/pics/finalfrontier.png
rename to examples/declarative/plasmapatrol/content/pics/finalfrontier.png
diff --git a/demos/declarative/plasmapatrol/content/pics/meteor.png b/examples/declarative/plasmapatrol/content/pics/meteor.png
similarity index 100%
rename from demos/declarative/plasmapatrol/content/pics/meteor.png
rename to examples/declarative/plasmapatrol/content/pics/meteor.png
diff --git a/demos/declarative/plasmapatrol/content/pics/meteor_explo.png b/examples/declarative/plasmapatrol/content/pics/meteor_explo.png
similarity index 100%
rename from demos/declarative/plasmapatrol/content/pics/meteor_explo.png
rename to examples/declarative/plasmapatrol/content/pics/meteor_explo.png
diff --git a/demos/declarative/plasmapatrol/content/pics/nullRock.png b/examples/declarative/plasmapatrol/content/pics/nullRock.png
similarity index 100%
rename from demos/declarative/plasmapatrol/content/pics/nullRock.png
rename to examples/declarative/plasmapatrol/content/pics/nullRock.png
diff --git a/demos/declarative/plasmapatrol/content/pics/particle.png b/examples/declarative/plasmapatrol/content/pics/particle.png
similarity index 100%
rename from demos/declarative/plasmapatrol/content/pics/particle.png
rename to examples/declarative/plasmapatrol/content/pics/particle.png
diff --git a/demos/declarative/plasmapatrol/content/pics/star.png b/examples/declarative/plasmapatrol/content/pics/star.png
similarity index 100%
rename from demos/declarative/plasmapatrol/content/pics/star.png
rename to examples/declarative/plasmapatrol/content/pics/star.png
diff --git a/demos/declarative/plasmapatrol/content/pics/star2.png b/examples/declarative/plasmapatrol/content/pics/star2.png
similarity index 100%
rename from demos/declarative/plasmapatrol/content/pics/star2.png
rename to examples/declarative/plasmapatrol/content/pics/star2.png
diff --git a/demos/declarative/plasmapatrol/content/pics/star3.png b/examples/declarative/plasmapatrol/content/pics/star3.png
similarity index 100%
rename from demos/declarative/plasmapatrol/content/pics/star3.png
rename to examples/declarative/plasmapatrol/content/pics/star3.png
diff --git a/demos/declarative/plasmapatrol/plasmapatrol.qml b/examples/declarative/plasmapatrol/plasmapatrol.qml
similarity index 100%
rename from demos/declarative/plasmapatrol/plasmapatrol.qml
rename to examples/declarative/plasmapatrol/plasmapatrol.qml
diff --git a/demos/declarative/rssnews/content/BusyIndicator.qml b/examples/declarative/rssnews/content/BusyIndicator.qml
similarity index 100%
rename from demos/declarative/rssnews/content/BusyIndicator.qml
rename to examples/declarative/rssnews/content/BusyIndicator.qml
diff --git a/demos/declarative/rssnews/content/CategoryDelegate.qml b/examples/declarative/rssnews/content/CategoryDelegate.qml
similarity index 100%
rename from demos/declarative/rssnews/content/CategoryDelegate.qml
rename to examples/declarative/rssnews/content/CategoryDelegate.qml
diff --git a/demos/declarative/rssnews/content/NewsDelegate.qml b/examples/declarative/rssnews/content/NewsDelegate.qml
similarity index 100%
rename from demos/declarative/rssnews/content/NewsDelegate.qml
rename to examples/declarative/rssnews/content/NewsDelegate.qml
diff --git a/demos/declarative/rssnews/content/RssFeeds.qml b/examples/declarative/rssnews/content/RssFeeds.qml
similarity index 100%
rename from demos/declarative/rssnews/content/RssFeeds.qml
rename to examples/declarative/rssnews/content/RssFeeds.qml
diff --git a/demos/declarative/rssnews/content/ScrollBar.qml b/examples/declarative/rssnews/content/ScrollBar.qml
similarity index 100%
rename from demos/declarative/rssnews/content/ScrollBar.qml
rename to examples/declarative/rssnews/content/ScrollBar.qml
diff --git a/demos/declarative/rssnews/content/images/busy.png b/examples/declarative/rssnews/content/images/busy.png
similarity index 100%
rename from demos/declarative/rssnews/content/images/busy.png
rename to examples/declarative/rssnews/content/images/busy.png
diff --git a/demos/declarative/rssnews/content/images/scrollbar.png b/examples/declarative/rssnews/content/images/scrollbar.png
similarity index 100%
rename from demos/declarative/rssnews/content/images/scrollbar.png
rename to examples/declarative/rssnews/content/images/scrollbar.png
diff --git a/demos/declarative/rssnews/rssnews.qml b/examples/declarative/rssnews/rssnews.qml
similarity index 100%
rename from demos/declarative/rssnews/rssnews.qml
rename to examples/declarative/rssnews/rssnews.qml
diff --git a/demos/declarative/rssnews/rssnews.qmlproject b/examples/declarative/rssnews/rssnews.qmlproject
similarity index 100%
rename from demos/declarative/rssnews/rssnews.qmlproject
rename to examples/declarative/rssnews/rssnews.qmlproject
diff --git a/demos/declarative/samegame/SamegameCore/BoomBlock.qml b/examples/declarative/samegame/SamegameCore/BoomBlock.qml
similarity index 100%
rename from demos/declarative/samegame/SamegameCore/BoomBlock.qml
rename to examples/declarative/samegame/SamegameCore/BoomBlock.qml
diff --git a/demos/declarative/samegame/SamegameCore/Button.qml b/examples/declarative/samegame/SamegameCore/Button.qml
similarity index 100%
rename from demos/declarative/samegame/SamegameCore/Button.qml
rename to examples/declarative/samegame/SamegameCore/Button.qml
diff --git a/demos/declarative/samegame/SamegameCore/Dialog.qml b/examples/declarative/samegame/SamegameCore/Dialog.qml
similarity index 100%
rename from demos/declarative/samegame/SamegameCore/Dialog.qml
rename to examples/declarative/samegame/SamegameCore/Dialog.qml
diff --git a/demos/declarative/samegame/SamegameCore/pics/background.png b/examples/declarative/samegame/SamegameCore/pics/background.png
similarity index 100%
rename from demos/declarative/samegame/SamegameCore/pics/background.png
rename to examples/declarative/samegame/SamegameCore/pics/background.png
diff --git a/demos/declarative/samegame/SamegameCore/pics/blueStone.png b/examples/declarative/samegame/SamegameCore/pics/blueStone.png
similarity index 100%
rename from demos/declarative/samegame/SamegameCore/pics/blueStone.png
rename to examples/declarative/samegame/SamegameCore/pics/blueStone.png
diff --git a/demos/declarative/samegame/SamegameCore/pics/greenStone.png b/examples/declarative/samegame/SamegameCore/pics/greenStone.png
similarity index 100%
rename from demos/declarative/samegame/SamegameCore/pics/greenStone.png
rename to examples/declarative/samegame/SamegameCore/pics/greenStone.png
diff --git a/demos/declarative/samegame/SamegameCore/pics/particle.png b/examples/declarative/samegame/SamegameCore/pics/particle.png
similarity index 100%
rename from demos/declarative/samegame/SamegameCore/pics/particle.png
rename to examples/declarative/samegame/SamegameCore/pics/particle.png
diff --git a/demos/declarative/samegame/SamegameCore/pics/redStone.png b/examples/declarative/samegame/SamegameCore/pics/redStone.png
similarity index 100%
rename from demos/declarative/samegame/SamegameCore/pics/redStone.png
rename to examples/declarative/samegame/SamegameCore/pics/redStone.png
diff --git a/demos/declarative/samegame/SamegameCore/pics/yellowStone.png b/examples/declarative/samegame/SamegameCore/pics/yellowStone.png
similarity index 100%
rename from demos/declarative/samegame/SamegameCore/pics/yellowStone.png
rename to examples/declarative/samegame/SamegameCore/pics/yellowStone.png
diff --git a/demos/declarative/samegame/SamegameCore/qmldir b/examples/declarative/samegame/SamegameCore/qmldir
similarity index 100%
rename from demos/declarative/samegame/SamegameCore/qmldir
rename to examples/declarative/samegame/SamegameCore/qmldir
diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/examples/declarative/samegame/SamegameCore/samegame.js
similarity index 100%
rename from demos/declarative/samegame/SamegameCore/samegame.js
rename to examples/declarative/samegame/SamegameCore/samegame.js
diff --git a/demos/declarative/samegame/highscores/README b/examples/declarative/samegame/highscores/README
similarity index 100%
rename from demos/declarative/samegame/highscores/README
rename to examples/declarative/samegame/highscores/README
diff --git a/demos/declarative/samegame/highscores/score_data.xml b/examples/declarative/samegame/highscores/score_data.xml
similarity index 100%
rename from demos/declarative/samegame/highscores/score_data.xml
rename to examples/declarative/samegame/highscores/score_data.xml
diff --git a/demos/declarative/samegame/highscores/score_style.xsl b/examples/declarative/samegame/highscores/score_style.xsl
similarity index 100%
rename from demos/declarative/samegame/highscores/score_style.xsl
rename to examples/declarative/samegame/highscores/score_style.xsl
diff --git a/demos/declarative/samegame/highscores/scores.php b/examples/declarative/samegame/highscores/scores.php
similarity index 100%
rename from demos/declarative/samegame/highscores/scores.php
rename to examples/declarative/samegame/highscores/scores.php
diff --git a/demos/declarative/samegame/samegame.qml b/examples/declarative/samegame/samegame.qml
similarity index 100%
rename from demos/declarative/samegame/samegame.qml
rename to examples/declarative/samegame/samegame.qml
diff --git a/demos/declarative/samegame/samegame.qmlproject b/examples/declarative/samegame/samegame.qmlproject
similarity index 100%
rename from demos/declarative/samegame/samegame.qmlproject
rename to examples/declarative/samegame/samegame.qmlproject
diff --git a/demos/declarative/shadereffects/Slider.qml b/examples/declarative/shadereffects/Slider.qml
similarity index 100%
rename from demos/declarative/shadereffects/Slider.qml
rename to examples/declarative/shadereffects/Slider.qml
diff --git a/demos/declarative/shadereffects/face-smile.png b/examples/declarative/shadereffects/face-smile.png
similarity index 100%
rename from demos/declarative/shadereffects/face-smile.png
rename to examples/declarative/shadereffects/face-smile.png
diff --git a/demos/declarative/shadereffects/qt-logo.png b/examples/declarative/shadereffects/qt-logo.png
similarity index 100%
rename from demos/declarative/shadereffects/qt-logo.png
rename to examples/declarative/shadereffects/qt-logo.png
diff --git a/demos/declarative/shadereffects/shader-demo.qml b/examples/declarative/shadereffects/shader-demo.qml
similarity index 100%
rename from demos/declarative/shadereffects/shader-demo.qml
rename to examples/declarative/shadereffects/shader-demo.qml
diff --git a/demos/declarative/snake/content/Button.qml b/examples/declarative/snake/content/Button.qml
similarity index 100%
rename from demos/declarative/snake/content/Button.qml
rename to examples/declarative/snake/content/Button.qml
diff --git a/demos/declarative/snake/content/Cookie.qml b/examples/declarative/snake/content/Cookie.qml
similarity index 100%
rename from demos/declarative/snake/content/Cookie.qml
rename to examples/declarative/snake/content/Cookie.qml
diff --git a/demos/declarative/snake/content/HighScoreModel.qml b/examples/declarative/snake/content/HighScoreModel.qml
similarity index 100%
rename from demos/declarative/snake/content/HighScoreModel.qml
rename to examples/declarative/snake/content/HighScoreModel.qml
diff --git a/demos/declarative/snake/content/Link.qml b/examples/declarative/snake/content/Link.qml
similarity index 100%
rename from demos/declarative/snake/content/Link.qml
rename to examples/declarative/snake/content/Link.qml
diff --git a/demos/declarative/snake/content/Skull.qml b/examples/declarative/snake/content/Skull.qml
similarity index 100%
rename from demos/declarative/snake/content/Skull.qml
rename to examples/declarative/snake/content/Skull.qml
diff --git a/demos/declarative/snake/content/pics/README b/examples/declarative/snake/content/pics/README
similarity index 100%
rename from demos/declarative/snake/content/pics/README
rename to examples/declarative/snake/content/pics/README
diff --git a/demos/declarative/snake/content/pics/background.png b/examples/declarative/snake/content/pics/background.png
similarity index 100%
rename from demos/declarative/snake/content/pics/background.png
rename to examples/declarative/snake/content/pics/background.png
diff --git a/demos/declarative/snake/content/pics/blueStar.png b/examples/declarative/snake/content/pics/blueStar.png
similarity index 100%
rename from demos/declarative/snake/content/pics/blueStar.png
rename to examples/declarative/snake/content/pics/blueStar.png
diff --git a/demos/declarative/snake/content/pics/blueStone.png b/examples/declarative/snake/content/pics/blueStone.png
similarity index 100%
rename from demos/declarative/snake/content/pics/blueStone.png
rename to examples/declarative/snake/content/pics/blueStone.png
diff --git a/demos/declarative/snake/content/pics/cookie.png b/examples/declarative/snake/content/pics/cookie.png
similarity index 100%
rename from demos/declarative/snake/content/pics/cookie.png
rename to examples/declarative/snake/content/pics/cookie.png
diff --git a/demos/declarative/snake/content/pics/eyes.svg b/examples/declarative/snake/content/pics/eyes.svg
similarity index 100%
rename from demos/declarative/snake/content/pics/eyes.svg
rename to examples/declarative/snake/content/pics/eyes.svg
diff --git a/demos/declarative/snake/content/pics/head.png b/examples/declarative/snake/content/pics/head.png
similarity index 100%
rename from demos/declarative/snake/content/pics/head.png
rename to examples/declarative/snake/content/pics/head.png
diff --git a/demos/declarative/snake/content/pics/head.svg b/examples/declarative/snake/content/pics/head.svg
similarity index 100%
rename from demos/declarative/snake/content/pics/head.svg
rename to examples/declarative/snake/content/pics/head.svg
diff --git a/demos/declarative/snake/content/pics/pause.png b/examples/declarative/snake/content/pics/pause.png
similarity index 100%
rename from demos/declarative/snake/content/pics/pause.png
rename to examples/declarative/snake/content/pics/pause.png
diff --git a/demos/declarative/snake/content/pics/redStar.png b/examples/declarative/snake/content/pics/redStar.png
similarity index 100%
rename from demos/declarative/snake/content/pics/redStar.png
rename to examples/declarative/snake/content/pics/redStar.png
diff --git a/demos/declarative/snake/content/pics/redStone.png b/examples/declarative/snake/content/pics/redStone.png
similarity index 100%
rename from demos/declarative/snake/content/pics/redStone.png
rename to examples/declarative/snake/content/pics/redStone.png
diff --git a/demos/declarative/snake/content/pics/skull.png b/examples/declarative/snake/content/pics/skull.png
similarity index 100%
rename from demos/declarative/snake/content/pics/skull.png
rename to examples/declarative/snake/content/pics/skull.png
diff --git a/demos/declarative/snake/content/pics/snake.jpg b/examples/declarative/snake/content/pics/snake.jpg
similarity index 100%
rename from demos/declarative/snake/content/pics/snake.jpg
rename to examples/declarative/snake/content/pics/snake.jpg
diff --git a/demos/declarative/snake/content/pics/star.png b/examples/declarative/snake/content/pics/star.png
similarity index 100%
rename from demos/declarative/snake/content/pics/star.png
rename to examples/declarative/snake/content/pics/star.png
diff --git a/demos/declarative/snake/content/pics/stoneShadow.png b/examples/declarative/snake/content/pics/stoneShadow.png
similarity index 100%
rename from demos/declarative/snake/content/pics/stoneShadow.png
rename to examples/declarative/snake/content/pics/stoneShadow.png
diff --git a/demos/declarative/snake/content/pics/yellowStar.png b/examples/declarative/snake/content/pics/yellowStar.png
similarity index 100%
rename from demos/declarative/snake/content/pics/yellowStar.png
rename to examples/declarative/snake/content/pics/yellowStar.png
diff --git a/demos/declarative/snake/content/pics/yellowStone.png b/examples/declarative/snake/content/pics/yellowStone.png
similarity index 100%
rename from demos/declarative/snake/content/pics/yellowStone.png
rename to examples/declarative/snake/content/pics/yellowStone.png
diff --git a/demos/declarative/snake/content/snake.js b/examples/declarative/snake/content/snake.js
similarity index 100%
rename from demos/declarative/snake/content/snake.js
rename to examples/declarative/snake/content/snake.js
diff --git a/demos/declarative/snake/snake.qml b/examples/declarative/snake/snake.qml
similarity index 100%
rename from demos/declarative/snake/snake.qml
rename to examples/declarative/snake/snake.qml
diff --git a/demos/declarative/snake/snake.qmlproject b/examples/declarative/snake/snake.qmlproject
similarity index 100%
rename from demos/declarative/snake/snake.qmlproject
rename to examples/declarative/snake/snake.qmlproject
diff --git a/demos/declarative/twitter/TwitterCore/Button.qml b/examples/declarative/twitter/TwitterCore/Button.qml
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/Button.qml
rename to examples/declarative/twitter/TwitterCore/Button.qml
diff --git a/demos/declarative/twitter/TwitterCore/FatDelegate.qml b/examples/declarative/twitter/TwitterCore/FatDelegate.qml
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/FatDelegate.qml
rename to examples/declarative/twitter/TwitterCore/FatDelegate.qml
diff --git a/demos/declarative/twitter/TwitterCore/Input.qml b/examples/declarative/twitter/TwitterCore/Input.qml
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/Input.qml
rename to examples/declarative/twitter/TwitterCore/Input.qml
diff --git a/demos/declarative/twitter/TwitterCore/Loading.qml b/examples/declarative/twitter/TwitterCore/Loading.qml
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/Loading.qml
rename to examples/declarative/twitter/TwitterCore/Loading.qml
diff --git a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml b/examples/declarative/twitter/TwitterCore/MultiTitleBar.qml
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
rename to examples/declarative/twitter/TwitterCore/MultiTitleBar.qml
diff --git a/demos/declarative/twitter/TwitterCore/RssModel.qml b/examples/declarative/twitter/TwitterCore/RssModel.qml
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/RssModel.qml
rename to examples/declarative/twitter/TwitterCore/RssModel.qml
diff --git a/demos/declarative/twitter/TwitterCore/SearchView.qml b/examples/declarative/twitter/TwitterCore/SearchView.qml
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/SearchView.qml
rename to examples/declarative/twitter/TwitterCore/SearchView.qml
diff --git a/demos/declarative/twitter/TwitterCore/TitleBar.qml b/examples/declarative/twitter/TwitterCore/TitleBar.qml
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/TitleBar.qml
rename to examples/declarative/twitter/TwitterCore/TitleBar.qml
diff --git a/demos/declarative/twitter/TwitterCore/ToolBar.qml b/examples/declarative/twitter/TwitterCore/ToolBar.qml
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/ToolBar.qml
rename to examples/declarative/twitter/TwitterCore/ToolBar.qml
diff --git a/demos/declarative/twitter/TwitterCore/UserModel.qml b/examples/declarative/twitter/TwitterCore/UserModel.qml
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/UserModel.qml
rename to examples/declarative/twitter/TwitterCore/UserModel.qml
diff --git a/demos/declarative/twitter/TwitterCore/images/gloss.png b/examples/declarative/twitter/TwitterCore/images/gloss.png
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/images/gloss.png
rename to examples/declarative/twitter/TwitterCore/images/gloss.png
diff --git a/demos/declarative/twitter/TwitterCore/images/lineedit.png b/examples/declarative/twitter/TwitterCore/images/lineedit.png
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/images/lineedit.png
rename to examples/declarative/twitter/TwitterCore/images/lineedit.png
diff --git a/demos/declarative/twitter/TwitterCore/images/lineedit.sci b/examples/declarative/twitter/TwitterCore/images/lineedit.sci
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/images/lineedit.sci
rename to examples/declarative/twitter/TwitterCore/images/lineedit.sci
diff --git a/demos/declarative/twitter/TwitterCore/images/loading.png b/examples/declarative/twitter/TwitterCore/images/loading.png
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/images/loading.png
rename to examples/declarative/twitter/TwitterCore/images/loading.png
diff --git a/demos/declarative/twitter/TwitterCore/images/quit.png b/examples/declarative/twitter/TwitterCore/images/quit.png
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/images/quit.png
rename to examples/declarative/twitter/TwitterCore/images/quit.png
diff --git a/demos/declarative/twitter/TwitterCore/images/stripes.png b/examples/declarative/twitter/TwitterCore/images/stripes.png
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/images/stripes.png
rename to examples/declarative/twitter/TwitterCore/images/stripes.png
diff --git a/demos/declarative/twitter/TwitterCore/images/titlebar.png b/examples/declarative/twitter/TwitterCore/images/titlebar.png
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/images/titlebar.png
rename to examples/declarative/twitter/TwitterCore/images/titlebar.png
diff --git a/demos/declarative/twitter/TwitterCore/images/titlebar.sci b/examples/declarative/twitter/TwitterCore/images/titlebar.sci
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/images/titlebar.sci
rename to examples/declarative/twitter/TwitterCore/images/titlebar.sci
diff --git a/demos/declarative/twitter/TwitterCore/images/toolbutton.png b/examples/declarative/twitter/TwitterCore/images/toolbutton.png
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/images/toolbutton.png
rename to examples/declarative/twitter/TwitterCore/images/toolbutton.png
diff --git a/demos/declarative/twitter/TwitterCore/images/toolbutton.sci b/examples/declarative/twitter/TwitterCore/images/toolbutton.sci
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/images/toolbutton.sci
rename to examples/declarative/twitter/TwitterCore/images/toolbutton.sci
diff --git a/demos/declarative/twitter/TwitterCore/qmldir b/examples/declarative/twitter/TwitterCore/qmldir
similarity index 100%
rename from demos/declarative/twitter/TwitterCore/qmldir
rename to examples/declarative/twitter/TwitterCore/qmldir
diff --git a/demos/declarative/twitter/twitter.qml b/examples/declarative/twitter/twitter.qml
similarity index 100%
rename from demos/declarative/twitter/twitter.qml
rename to examples/declarative/twitter/twitter.qml
diff --git a/demos/declarative/twitter/twitter.qmlproject b/examples/declarative/twitter/twitter.qmlproject
similarity index 100%
rename from demos/declarative/twitter/twitter.qmlproject
rename to examples/declarative/twitter/twitter.qmlproject
diff --git a/demos/embedded/embedded.pro b/examples/embedded/embedded.pro
similarity index 100%
rename from demos/embedded/embedded.pro
rename to examples/embedded/embedded.pro
diff --git a/demos/embedded/qmlcalculator/deployment.pri b/examples/embedded/qmlcalculator/deployment.pri
similarity index 100%
rename from demos/embedded/qmlcalculator/deployment.pri
rename to examples/embedded/qmlcalculator/deployment.pri
diff --git a/demos/embedded/qmlcalculator/qmlcalculator.cpp b/examples/embedded/qmlcalculator/qmlcalculator.cpp
similarity index 100%
rename from demos/embedded/qmlcalculator/qmlcalculator.cpp
rename to examples/embedded/qmlcalculator/qmlcalculator.cpp
diff --git a/demos/embedded/qmlcalculator/qmlcalculator.pro b/examples/embedded/qmlcalculator/qmlcalculator.pro
similarity index 100%
rename from demos/embedded/qmlcalculator/qmlcalculator.pro
rename to examples/embedded/qmlcalculator/qmlcalculator.pro
diff --git a/demos/embedded/qmlclocks/deployment.pri b/examples/embedded/qmlclocks/deployment.pri
similarity index 100%
rename from demos/embedded/qmlclocks/deployment.pri
rename to examples/embedded/qmlclocks/deployment.pri
diff --git a/demos/embedded/qmlclocks/qmlclocks.cpp b/examples/embedded/qmlclocks/qmlclocks.cpp
similarity index 100%
rename from demos/embedded/qmlclocks/qmlclocks.cpp
rename to examples/embedded/qmlclocks/qmlclocks.cpp
diff --git a/demos/embedded/qmlclocks/qmlclocks.pro b/examples/embedded/qmlclocks/qmlclocks.pro
similarity index 100%
rename from demos/embedded/qmlclocks/qmlclocks.pro
rename to examples/embedded/qmlclocks/qmlclocks.pro
diff --git a/demos/embedded/qmldialcontrol/deployment.pri b/examples/embedded/qmldialcontrol/deployment.pri
similarity index 100%
rename from demos/embedded/qmldialcontrol/deployment.pri
rename to examples/embedded/qmldialcontrol/deployment.pri
diff --git a/demos/embedded/qmldialcontrol/qmldialcontrol.cpp b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp
similarity index 100%
rename from demos/embedded/qmldialcontrol/qmldialcontrol.cpp
rename to examples/embedded/qmldialcontrol/qmldialcontrol.cpp
diff --git a/demos/embedded/qmldialcontrol/qmldialcontrol.pro b/examples/embedded/qmldialcontrol/qmldialcontrol.pro
similarity index 100%
rename from demos/embedded/qmldialcontrol/qmldialcontrol.pro
rename to examples/embedded/qmldialcontrol/qmldialcontrol.pro
diff --git a/demos/embedded/qmleasing/deployment.pri b/examples/embedded/qmleasing/deployment.pri
similarity index 100%
rename from demos/embedded/qmleasing/deployment.pri
rename to examples/embedded/qmleasing/deployment.pri
diff --git a/demos/embedded/qmleasing/qmleasing.cpp b/examples/embedded/qmleasing/qmleasing.cpp
similarity index 100%
rename from demos/embedded/qmleasing/qmleasing.cpp
rename to examples/embedded/qmleasing/qmleasing.cpp
diff --git a/demos/embedded/qmleasing/qmleasing.pro b/examples/embedded/qmleasing/qmleasing.pro
similarity index 100%
rename from demos/embedded/qmleasing/qmleasing.pro
rename to examples/embedded/qmleasing/qmleasing.pro
diff --git a/demos/embedded/qmlflickr/deployment.pri b/examples/embedded/qmlflickr/deployment.pri
similarity index 100%
rename from demos/embedded/qmlflickr/deployment.pri
rename to examples/embedded/qmlflickr/deployment.pri
diff --git a/demos/embedded/qmlflickr/qmlflickr.cpp b/examples/embedded/qmlflickr/qmlflickr.cpp
similarity index 100%
rename from demos/embedded/qmlflickr/qmlflickr.cpp
rename to examples/embedded/qmlflickr/qmlflickr.cpp
diff --git a/demos/embedded/qmlflickr/qmlflickr.pro b/examples/embedded/qmlflickr/qmlflickr.pro
similarity index 100%
rename from demos/embedded/qmlflickr/qmlflickr.pro
rename to examples/embedded/qmlflickr/qmlflickr.pro
diff --git a/demos/embedded/qmlphotoviewer/deployment.pri b/examples/embedded/qmlphotoviewer/deployment.pri
similarity index 100%
rename from demos/embedded/qmlphotoviewer/deployment.pri
rename to examples/embedded/qmlphotoviewer/deployment.pri
diff --git a/demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
similarity index 100%
rename from demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp
rename to examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
diff --git a/demos/embedded/qmlphotoviewer/qmlphotoviewer.pro b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
similarity index 100%
rename from demos/embedded/qmlphotoviewer/qmlphotoviewer.pro
rename to examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
diff --git a/demos/embedded/qmltwitter/deployment.pri b/examples/embedded/qmltwitter/deployment.pri
similarity index 100%
rename from demos/embedded/qmltwitter/deployment.pri
rename to examples/embedded/qmltwitter/deployment.pri
diff --git a/demos/embedded/qmltwitter/qmltwitter.cpp b/examples/embedded/qmltwitter/qmltwitter.cpp
similarity index 100%
rename from demos/embedded/qmltwitter/qmltwitter.cpp
rename to examples/embedded/qmltwitter/qmltwitter.cpp
diff --git a/demos/embedded/qmltwitter/qmltwitter.pro b/examples/embedded/qmltwitter/qmltwitter.pro
similarity index 100%
rename from demos/embedded/qmltwitter/qmltwitter.pro
rename to examples/embedded/qmltwitter/qmltwitter.pro
diff --git a/qtdeclarative.pro b/qtdeclarative.pro
index 678fdf33980f35fd5f9bbf9ef9d0358330913c57..084a7200c5fa800f9c2cb3a38708d8538e735b7f 100644
--- a/qtdeclarative.pro
+++ b/qtdeclarative.pro
@@ -7,13 +7,6 @@ module_qtdeclarative_tools.subdir = tools
module_qtdeclarative_tools.target = module-qtdeclarative-tools
module_qtdeclarative_tools.depends = module_qtdeclarative_src
-module_qtdeclarative_demos.subdir = demos
-module_qtdeclarative_demos.target = module-qtdeclarative-demos
-module_qtdeclarative_demos.depends = module_qtdeclarative_src
-!contains(QT_BUILD_PARTS,demos) {
- module_qtdeclarative_demos.CONFIG = no_default_target no_default_install
-}
-
module_qtdeclarative_examples.subdir = examples/declarative
module_qtdeclarative_examples.target = module-qtdeclarative-examples
module_qtdeclarative_examples.depends = module_qtdeclarative_src
@@ -29,6 +22,5 @@ module_qtdeclarative_tests.CONFIG = no_default_install
SUBDIRS += module_qtdeclarative_src \
module_qtdeclarative_tools \
- module_qtdeclarative_demos \
module_qtdeclarative_examples \
module_qtdeclarative_tests \