213 files changed, 12 insertions, 48 deletions

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