More consistent examples directory structure

Under examples the next directory level distinguishes imports/modules
and the next directory level distinguishes examples.

Change-Id: Icabadaac6ccb9c1c424efa9c9e64a7d94bc7c0da
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

200 files changed, 52 insertions, 246 deletions

diff --git a/examples/localstorage/localstorage.pro b/examples/localstorage/localstorage.pro
index 311dc4ac8b..dd2eb80250 100644
--- a/examples/localstorage/localstorage.pro
+++ b/examples/localstorage/localstorage.pro
@@ -1,9 +1,2 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/localstorage
-qml.files = localstorage.qml hello.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/localstorage
-INSTALLS += target qml
+TEMPLATE = subdirs
+SUBDIRS += localstorage
diff --git a/examples/localstorage/hello.qml b/examples/localstorage/localstorage/hello.qml
index 3496b86bd9..3496b86bd9 100644
--- a/examples/localstorage/hello.qml
+++ b/examples/localstorage/localstorage/hello.qml
diff --git a/examples/localstorage/localstorage/localstorage.pro b/examples/localstorage/localstorage/localstorage.pro
new file mode 100644
index 0000000000..311dc4ac8b
--- /dev/null
+++ b/examples/localstorage/localstorage/localstorage.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/localstorage
+qml.files = localstorage.qml hello.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/localstorage
+INSTALLS += target qml
diff --git a/examples/localstorage/localstorage.qml b/examples/localstorage/localstorage/localstorage.qml
index 714774c78e..714774c78e 100644
--- a/examples/localstorage/localstorage.qml
+++ b/examples/localstorage/localstorage/localstorage.qml
diff --git a/examples/localstorage/localstorage.qmlproject b/examples/localstorage/localstorage/localstorage.qmlproject
index 6835d23503..6835d23503 100644
--- a/examples/localstorage/localstorage.qmlproject
+++ b/examples/localstorage/localstorage/localstorage.qmlproject
diff --git a/examples/localstorage/main.cpp b/examples/localstorage/localstorage/main.cpp
index 484fcdbefc..005ed2008b 100644
--- a/examples/localstorage/main.cpp
+++ b/examples/localstorage/localstorage/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(localstorage)
\ No newline at end of file
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(localstorage)
diff --git a/examples/qml/cppextensions/cppextensions.pro b/examples/qml/cppextensions/cppextensions.pro
deleted file mode 100644
index cde19b5c90..0000000000
--- a/examples/qml/cppextensions/cppextensions.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    imageprovider \
-    plugins \
-    networkaccessmanagerfactory \
-    referenceexamples
-
diff --git a/examples/qml/cppextensions/cppextensions.qmlproject b/examples/qml/cppextensions/cppextensions.qmlproject
deleted file mode 100644
index 6b362842cb..0000000000
--- a/examples/qml/cppextensions/cppextensions.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: [ "plugins" ]
-}
diff --git a/examples/qml/cppextensions/imageprovider/ImageProviderCore/qmldir b/examples/qml/imageprovider/ImageProviderCore/qmldir
index 6be88bccec..6be88bccec 100644
--- a/examples/qml/cppextensions/imageprovider/ImageProviderCore/qmldir
+++ b/examples/qml/imageprovider/ImageProviderCore/qmldir
diff --git a/examples/qml/cppextensions/imageprovider/imageprovider-example.qml b/examples/qml/imageprovider/imageprovider-example.qml
index fe2f1b130b..fe2f1b130b 100644
--- a/examples/qml/cppextensions/imageprovider/imageprovider-example.qml
+++ b/examples/qml/imageprovider/imageprovider-example.qml
diff --git a/examples/qml/cppextensions/imageprovider/imageprovider.cpp b/examples/qml/imageprovider/imageprovider.cpp
index a203ad8053..a203ad8053 100644
--- a/examples/qml/cppextensions/imageprovider/imageprovider.cpp
+++ b/examples/qml/imageprovider/imageprovider.cpp
diff --git a/examples/qml/cppextensions/imageprovider/imageprovider.pro b/examples/qml/imageprovider/imageprovider.pro
index e85bad9866..e85bad9866 100644
--- a/examples/qml/cppextensions/imageprovider/imageprovider.pro
+++ b/examples/qml/imageprovider/imageprovider.pro
diff --git a/examples/qml/cppextensions/imageprovider/imageprovider.qmlproject b/examples/qml/imageprovider/imageprovider.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/qml/cppextensions/imageprovider/imageprovider.qmlproject
+++ b/examples/qml/imageprovider/imageprovider.qmlproject
diff --git a/examples/qml/cppextensions/networkaccessmanagerfactory/main.cpp b/examples/qml/networkaccessmanagerfactory/main.cpp
index 6ebded0512..6ebded0512 100644
--- a/examples/qml/cppextensions/networkaccessmanagerfactory/main.cpp
+++ b/examples/qml/networkaccessmanagerfactory/main.cpp
diff --git a/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 6cbc24a7b8..6cbc24a7b8 100644
--- a/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
diff --git a/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject
+++ b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject
diff --git a/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc
index 17e9301471..17e9301471 100644
--- a/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc
+++ b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc
diff --git a/examples/qml/cppextensions/networkaccessmanagerfactory/view.qml b/examples/qml/networkaccessmanagerfactory/view.qml
index b2d46a991f..b2d46a991f 100644
--- a/examples/qml/cppextensions/networkaccessmanagerfactory/view.qml
+++ b/examples/qml/networkaccessmanagerfactory/view.qml
diff --git a/examples/qml/cppextensions/plugins/README b/examples/qml/plugins/README
index f4f9074059..f4f9074059 100644
--- a/examples/qml/cppextensions/plugins/README
+++ b/examples/qml/plugins/README
diff --git a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/Clock.qml b/examples/qml/plugins/com/nokia/TimeExample/Clock.qml
index eac9226a00..eac9226a00 100644
--- a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
+++ b/examples/qml/plugins/com/nokia/TimeExample/Clock.qml
diff --git a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/center.png b/examples/qml/plugins/com/nokia/TimeExample/center.png
index 7fbd802a44..7fbd802a44 100644
--- a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/center.png
+++ b/examples/qml/plugins/com/nokia/TimeExample/center.png
diff --git a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/clock.png b/examples/qml/plugins/com/nokia/TimeExample/clock.png
index 462edacc0e..462edacc0e 100644
--- a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/clock.png
+++ b/examples/qml/plugins/com/nokia/TimeExample/clock.png
diff --git a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/hour.png b/examples/qml/plugins/com/nokia/TimeExample/hour.png
index f8061a1235..f8061a1235 100644
--- a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/hour.png
+++ b/examples/qml/plugins/com/nokia/TimeExample/hour.png
diff --git a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/minute.png b/examples/qml/plugins/com/nokia/TimeExample/minute.png
index 1297ec7c2b..1297ec7c2b 100644
--- a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/minute.png
+++ b/examples/qml/plugins/com/nokia/TimeExample/minute.png
diff --git a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/qmldir b/examples/qml/plugins/com/nokia/TimeExample/qmldir
index e1288cfac0..e1288cfac0 100644
--- a/examples/qml/cppextensions/plugins/com/nokia/TimeExample/qmldir
+++ b/examples/qml/plugins/com/nokia/TimeExample/qmldir
diff --git a/examples/qml/cppextensions/plugins/plugin.cpp b/examples/qml/plugins/plugin.cpp
index f20e6935be..f20e6935be 100644
--- a/examples/qml/cppextensions/plugins/plugin.cpp
+++ b/examples/qml/plugins/plugin.cpp
diff --git a/examples/qml/cppextensions/plugins/plugins.pro b/examples/qml/plugins/plugins.pro
index e127509c0d..e127509c0d 100644
--- a/examples/qml/cppextensions/plugins/plugins.pro
+++ b/examples/qml/plugins/plugins.pro
diff --git a/examples/qml/cppextensions/plugins/plugins.qml b/examples/qml/plugins/plugins.qml
index f1048ddd36..f1048ddd36 100644
--- a/examples/qml/cppextensions/plugins/plugins.qml
+++ b/examples/qml/plugins/plugins.qml
diff --git a/examples/qml/cppextensions/plugins/plugins.qmlproject b/examples/qml/plugins/plugins.qmlproject
index 771ab45b66..771ab45b66 100644
--- a/examples/qml/cppextensions/plugins/plugins.qmlproject
+++ b/examples/qml/plugins/plugins.qmlproject
diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro
index 967108504e..ce5efbb823 100644
--- a/examples/qml/qml.pro
+++ b/examples/qml/qml.pro
@@ -1 +1,7 @@
 TEMPLATE = subdirs
+
+SUBDIRS +=imageprovider \
+          plugins \
+          networkaccessmanagerfactory \
+          referenceexamples \
+          shell
diff --git a/examples/qml/cppextensions/referenceexamples/adding/adding.pro b/examples/qml/referenceexamples/adding/adding.pro
index 706322e9ff..706322e9ff 100644
--- a/examples/qml/cppextensions/referenceexamples/adding/adding.pro
+++ b/examples/qml/referenceexamples/adding/adding.pro
diff --git a/examples/qml/cppextensions/referenceexamples/adding/adding.qrc b/examples/qml/referenceexamples/adding/adding.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/qml/cppextensions/referenceexamples/adding/adding.qrc
+++ b/examples/qml/referenceexamples/adding/adding.qrc
diff --git a/examples/qml/cppextensions/referenceexamples/adding/example.qml b/examples/qml/referenceexamples/adding/example.qml
index 3b2ca34d10..3b2ca34d10 100644
--- a/examples/qml/cppextensions/referenceexamples/adding/example.qml
+++ b/examples/qml/referenceexamples/adding/example.qml
diff --git a/examples/qml/cppextensions/referenceexamples/adding/main.cpp b/examples/qml/referenceexamples/adding/main.cpp
index c3a0ab6812..c3a0ab6812 100644
--- a/examples/qml/cppextensions/referenceexamples/adding/main.cpp
+++ b/examples/qml/referenceexamples/adding/main.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/adding/person.cpp b/examples/qml/referenceexamples/adding/person.cpp
index 0e78b0b77b..0e78b0b77b 100644
--- a/examples/qml/cppextensions/referenceexamples/adding/person.cpp
+++ b/examples/qml/referenceexamples/adding/person.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/adding/person.h b/examples/qml/referenceexamples/adding/person.h
index 45fb2f3297..45fb2f3297 100644
--- a/examples/qml/cppextensions/referenceexamples/adding/person.h
+++ b/examples/qml/referenceexamples/adding/person.h
diff --git a/examples/qml/cppextensions/referenceexamples/attached/attached.pro b/examples/qml/referenceexamples/attached/attached.pro
index f4385e1a30..f4385e1a30 100644
--- a/examples/qml/cppextensions/referenceexamples/attached/attached.pro
+++ b/examples/qml/referenceexamples/attached/attached.pro
diff --git a/examples/qml/cppextensions/referenceexamples/attached/attached.qrc b/examples/qml/referenceexamples/attached/attached.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/qml/cppextensions/referenceexamples/attached/attached.qrc
+++ b/examples/qml/referenceexamples/attached/attached.qrc
diff --git a/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.cpp b/examples/qml/referenceexamples/attached/birthdayparty.cpp
index c4f906119a..c4f906119a 100644
--- a/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/attached/birthdayparty.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.h b/examples/qml/referenceexamples/attached/birthdayparty.h
index 1da6c34026..1da6c34026 100644
--- a/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.h
+++ b/examples/qml/referenceexamples/attached/birthdayparty.h
diff --git a/examples/qml/cppextensions/referenceexamples/attached/example.qml b/examples/qml/referenceexamples/attached/example.qml
index aaf998d386..aaf998d386 100644
--- a/examples/qml/cppextensions/referenceexamples/attached/example.qml
+++ b/examples/qml/referenceexamples/attached/example.qml
diff --git a/examples/qml/cppextensions/referenceexamples/attached/main.cpp b/examples/qml/referenceexamples/attached/main.cpp
index ce067bbbf7..ce067bbbf7 100644
--- a/examples/qml/cppextensions/referenceexamples/attached/main.cpp
+++ b/examples/qml/referenceexamples/attached/main.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/attached/person.cpp b/examples/qml/referenceexamples/attached/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/qml/cppextensions/referenceexamples/attached/person.cpp
+++ b/examples/qml/referenceexamples/attached/person.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/attached/person.h b/examples/qml/referenceexamples/attached/person.h
index 032eca3c17..032eca3c17 100644
--- a/examples/qml/cppextensions/referenceexamples/attached/person.h
+++ b/examples/qml/referenceexamples/attached/person.h
diff --git a/examples/qml/cppextensions/referenceexamples/binding/binding.pro b/examples/qml/referenceexamples/binding/binding.pro
index 0379f93ea7..0379f93ea7 100644
--- a/examples/qml/cppextensions/referenceexamples/binding/binding.pro
+++ b/examples/qml/referenceexamples/binding/binding.pro
diff --git a/examples/qml/cppextensions/referenceexamples/binding/binding.qrc b/examples/qml/referenceexamples/binding/binding.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/qml/cppextensions/referenceexamples/binding/binding.qrc
+++ b/examples/qml/referenceexamples/binding/binding.qrc
diff --git a/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.cpp b/examples/qml/referenceexamples/binding/birthdayparty.cpp
index 62499862f0..62499862f0 100644
--- a/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/binding/birthdayparty.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.h b/examples/qml/referenceexamples/binding/birthdayparty.h
index 195e9cd9cf..195e9cd9cf 100644
--- a/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.h
+++ b/examples/qml/referenceexamples/binding/birthdayparty.h
diff --git a/examples/qml/cppextensions/referenceexamples/binding/example.qml b/examples/qml/referenceexamples/binding/example.qml
index 9d46adc5fc..9d46adc5fc 100644
--- a/examples/qml/cppextensions/referenceexamples/binding/example.qml
+++ b/examples/qml/referenceexamples/binding/example.qml
diff --git a/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.cpp b/examples/qml/referenceexamples/binding/happybirthdaysong.cpp
index 90220e15ae..90220e15ae 100644
--- a/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
+++ b/examples/qml/referenceexamples/binding/happybirthdaysong.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.h b/examples/qml/referenceexamples/binding/happybirthdaysong.h
index ace48b2af0..ace48b2af0 100644
--- a/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.h
+++ b/examples/qml/referenceexamples/binding/happybirthdaysong.h
diff --git a/examples/qml/cppextensions/referenceexamples/binding/main.cpp b/examples/qml/referenceexamples/binding/main.cpp
index 389cb7609b..389cb7609b 100644
--- a/examples/qml/cppextensions/referenceexamples/binding/main.cpp
+++ b/examples/qml/referenceexamples/binding/main.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/binding/person.cpp b/examples/qml/referenceexamples/binding/person.cpp
index 89e7127caf..89e7127caf 100644
--- a/examples/qml/cppextensions/referenceexamples/binding/person.cpp
+++ b/examples/qml/referenceexamples/binding/person.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/binding/person.h b/examples/qml/referenceexamples/binding/person.h
index d0f196b95c..d0f196b95c 100644
--- a/examples/qml/cppextensions/referenceexamples/binding/person.h
+++ b/examples/qml/referenceexamples/binding/person.h
diff --git a/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.cpp b/examples/qml/referenceexamples/coercion/birthdayparty.cpp
index e15ffe1604..e15ffe1604 100644
--- a/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/coercion/birthdayparty.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.h b/examples/qml/referenceexamples/coercion/birthdayparty.h
index 43611693d9..43611693d9 100644
--- a/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.h
+++ b/examples/qml/referenceexamples/coercion/birthdayparty.h
diff --git a/examples/qml/cppextensions/referenceexamples/coercion/coercion.pro b/examples/qml/referenceexamples/coercion/coercion.pro
index 60e8532bab..60e8532bab 100644
--- a/examples/qml/cppextensions/referenceexamples/coercion/coercion.pro
+++ b/examples/qml/referenceexamples/coercion/coercion.pro
diff --git a/examples/qml/cppextensions/referenceexamples/coercion/coercion.qrc b/examples/qml/referenceexamples/coercion/coercion.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/qml/cppextensions/referenceexamples/coercion/coercion.qrc
+++ b/examples/qml/referenceexamples/coercion/coercion.qrc
diff --git a/examples/qml/cppextensions/referenceexamples/coercion/example.qml b/examples/qml/referenceexamples/coercion/example.qml
index 25791f38f8..25791f38f8 100644
--- a/examples/qml/cppextensions/referenceexamples/coercion/example.qml
+++ b/examples/qml/referenceexamples/coercion/example.qml
diff --git a/examples/qml/cppextensions/referenceexamples/coercion/main.cpp b/examples/qml/referenceexamples/coercion/main.cpp
index 15e41ca597..15e41ca597 100644
--- a/examples/qml/cppextensions/referenceexamples/coercion/main.cpp
+++ b/examples/qml/referenceexamples/coercion/main.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/coercion/person.cpp b/examples/qml/referenceexamples/coercion/person.cpp
index b28d63216e..b28d63216e 100644
--- a/examples/qml/cppextensions/referenceexamples/coercion/person.cpp
+++ b/examples/qml/referenceexamples/coercion/person.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/coercion/person.h b/examples/qml/referenceexamples/coercion/person.h
index dc4ae43dd6..dc4ae43dd6 100644
--- a/examples/qml/cppextensions/referenceexamples/coercion/person.h
+++ b/examples/qml/referenceexamples/coercion/person.h
diff --git a/examples/qml/cppextensions/referenceexamples/default/birthdayparty.cpp b/examples/qml/referenceexamples/default/birthdayparty.cpp
index e15ffe1604..e15ffe1604 100644
--- a/examples/qml/cppextensions/referenceexamples/default/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/default/birthdayparty.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/default/birthdayparty.h b/examples/qml/referenceexamples/default/birthdayparty.h
index 3ee635039d..3ee635039d 100644
--- a/examples/qml/cppextensions/referenceexamples/default/birthdayparty.h
+++ b/examples/qml/referenceexamples/default/birthdayparty.h
diff --git a/examples/qml/cppextensions/referenceexamples/default/default.pro b/examples/qml/referenceexamples/default/default.pro
index 36ef39fc55..36ef39fc55 100644
--- a/examples/qml/cppextensions/referenceexamples/default/default.pro
+++ b/examples/qml/referenceexamples/default/default.pro
diff --git a/examples/qml/cppextensions/referenceexamples/default/default.qrc b/examples/qml/referenceexamples/default/default.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/qml/cppextensions/referenceexamples/default/default.qrc
+++ b/examples/qml/referenceexamples/default/default.qrc
diff --git a/examples/qml/cppextensions/referenceexamples/default/example.qml b/examples/qml/referenceexamples/default/example.qml
index 9ef24b59b7..9ef24b59b7 100644
--- a/examples/qml/cppextensions/referenceexamples/default/example.qml
+++ b/examples/qml/referenceexamples/default/example.qml
diff --git a/examples/qml/cppextensions/referenceexamples/default/main.cpp b/examples/qml/referenceexamples/default/main.cpp
index 175945fc5d..175945fc5d 100644
--- a/examples/qml/cppextensions/referenceexamples/default/main.cpp
+++ b/examples/qml/referenceexamples/default/main.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/default/person.cpp b/examples/qml/referenceexamples/default/person.cpp
index 5a615a1ecd..5a615a1ecd 100644
--- a/examples/qml/cppextensions/referenceexamples/default/person.cpp
+++ b/examples/qml/referenceexamples/default/person.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/default/person.h b/examples/qml/referenceexamples/default/person.h
index d85672798c..d85672798c 100644
--- a/examples/qml/cppextensions/referenceexamples/default/person.h
+++ b/examples/qml/referenceexamples/default/person.h
diff --git a/examples/qml/cppextensions/referenceexamples/extended/example.qml b/examples/qml/referenceexamples/extended/example.qml
index 642a95d443..642a95d443 100644
--- a/examples/qml/cppextensions/referenceexamples/extended/example.qml
+++ b/examples/qml/referenceexamples/extended/example.qml
diff --git a/examples/qml/cppextensions/referenceexamples/extended/extended.pro b/examples/qml/referenceexamples/extended/extended.pro
index 206ea19c61..206ea19c61 100644
--- a/examples/qml/cppextensions/referenceexamples/extended/extended.pro
+++ b/examples/qml/referenceexamples/extended/extended.pro
diff --git a/examples/qml/cppextensions/referenceexamples/extended/extended.qrc b/examples/qml/referenceexamples/extended/extended.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/qml/cppextensions/referenceexamples/extended/extended.qrc
+++ b/examples/qml/referenceexamples/extended/extended.qrc
diff --git a/examples/qml/cppextensions/referenceexamples/extended/lineedit.cpp b/examples/qml/referenceexamples/extended/lineedit.cpp
index a3b1d0d54e..a3b1d0d54e 100644
--- a/examples/qml/cppextensions/referenceexamples/extended/lineedit.cpp
+++ b/examples/qml/referenceexamples/extended/lineedit.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/extended/lineedit.h b/examples/qml/referenceexamples/extended/lineedit.h
index fa8c75df78..fa8c75df78 100644
--- a/examples/qml/cppextensions/referenceexamples/extended/lineedit.h
+++ b/examples/qml/referenceexamples/extended/lineedit.h
diff --git a/examples/qml/cppextensions/referenceexamples/extended/main.cpp b/examples/qml/referenceexamples/extended/main.cpp
index de7c450169..de7c450169 100644
--- a/examples/qml/cppextensions/referenceexamples/extended/main.cpp
+++ b/examples/qml/referenceexamples/extended/main.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.cpp b/examples/qml/referenceexamples/grouped/birthdayparty.cpp
index e15ffe1604..e15ffe1604 100644
--- a/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/grouped/birthdayparty.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.h b/examples/qml/referenceexamples/grouped/birthdayparty.h
index 5ca0e9b982..5ca0e9b982 100644
--- a/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.h
+++ b/examples/qml/referenceexamples/grouped/birthdayparty.h
diff --git a/examples/qml/cppextensions/referenceexamples/grouped/example.qml b/examples/qml/referenceexamples/grouped/example.qml
index 22923ca395..22923ca395 100644
--- a/examples/qml/cppextensions/referenceexamples/grouped/example.qml
+++ b/examples/qml/referenceexamples/grouped/example.qml
diff --git a/examples/qml/cppextensions/referenceexamples/grouped/grouped.pro b/examples/qml/referenceexamples/grouped/grouped.pro
index d32a98f79b..d32a98f79b 100644
--- a/examples/qml/cppextensions/referenceexamples/grouped/grouped.pro
+++ b/examples/qml/referenceexamples/grouped/grouped.pro
diff --git a/examples/qml/cppextensions/referenceexamples/grouped/grouped.qrc b/examples/qml/referenceexamples/grouped/grouped.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/qml/cppextensions/referenceexamples/grouped/grouped.qrc
+++ b/examples/qml/referenceexamples/grouped/grouped.qrc
diff --git a/examples/qml/cppextensions/referenceexamples/grouped/main.cpp b/examples/qml/referenceexamples/grouped/main.cpp
index 55be3b715b..55be3b715b 100644
--- a/examples/qml/cppextensions/referenceexamples/grouped/main.cpp
+++ b/examples/qml/referenceexamples/grouped/main.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/grouped/person.cpp b/examples/qml/referenceexamples/grouped/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/qml/cppextensions/referenceexamples/grouped/person.cpp
+++ b/examples/qml/referenceexamples/grouped/person.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/grouped/person.h b/examples/qml/referenceexamples/grouped/person.h
index dea715bacb..dea715bacb 100644
--- a/examples/qml/cppextensions/referenceexamples/grouped/person.h
+++ b/examples/qml/referenceexamples/grouped/person.h
diff --git a/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.cpp b/examples/qml/referenceexamples/methods/birthdayparty.cpp
index c96f41d944..c96f41d944 100644
--- a/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/methods/birthdayparty.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.h b/examples/qml/referenceexamples/methods/birthdayparty.h
index df8a859972..df8a859972 100644
--- a/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.h
+++ b/examples/qml/referenceexamples/methods/birthdayparty.h
diff --git a/examples/qml/cppextensions/referenceexamples/methods/example.qml b/examples/qml/referenceexamples/methods/example.qml
index 9119835e04..9119835e04 100644
--- a/examples/qml/cppextensions/referenceexamples/methods/example.qml
+++ b/examples/qml/referenceexamples/methods/example.qml
diff --git a/examples/qml/cppextensions/referenceexamples/methods/main.cpp b/examples/qml/referenceexamples/methods/main.cpp
index 1e502c3943..1e502c3943 100644
--- a/examples/qml/cppextensions/referenceexamples/methods/main.cpp
+++ b/examples/qml/referenceexamples/methods/main.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/methods/methods.pro b/examples/qml/referenceexamples/methods/methods.pro
index f4c63bfa29..f4c63bfa29 100644
--- a/examples/qml/cppextensions/referenceexamples/methods/methods.pro
+++ b/examples/qml/referenceexamples/methods/methods.pro
diff --git a/examples/qml/cppextensions/referenceexamples/methods/methods.qrc b/examples/qml/referenceexamples/methods/methods.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/qml/cppextensions/referenceexamples/methods/methods.qrc
+++ b/examples/qml/referenceexamples/methods/methods.qrc
diff --git a/examples/qml/cppextensions/referenceexamples/methods/person.cpp b/examples/qml/referenceexamples/methods/person.cpp
index 30d1e46e5a..30d1e46e5a 100644
--- a/examples/qml/cppextensions/referenceexamples/methods/person.cpp
+++ b/examples/qml/referenceexamples/methods/person.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/methods/person.h b/examples/qml/referenceexamples/methods/person.h
index dd3ad4d188..dd3ad4d188 100644
--- a/examples/qml/cppextensions/referenceexamples/methods/person.h
+++ b/examples/qml/referenceexamples/methods/person.h
diff --git a/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.cpp b/examples/qml/referenceexamples/properties/birthdayparty.cpp
index 8e79d07748..8e79d07748 100644
--- a/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/properties/birthdayparty.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.h b/examples/qml/referenceexamples/properties/birthdayparty.h
index 84eefa52ae..84eefa52ae 100644
--- a/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.h
+++ b/examples/qml/referenceexamples/properties/birthdayparty.h
diff --git a/examples/qml/cppextensions/referenceexamples/properties/example.qml b/examples/qml/referenceexamples/properties/example.qml
index 36ee952243..36ee952243 100644
--- a/examples/qml/cppextensions/referenceexamples/properties/example.qml
+++ b/examples/qml/referenceexamples/properties/example.qml
diff --git a/examples/qml/cppextensions/referenceexamples/properties/main.cpp b/examples/qml/referenceexamples/properties/main.cpp
index cc0de89221..cc0de89221 100644
--- a/examples/qml/cppextensions/referenceexamples/properties/main.cpp
+++ b/examples/qml/referenceexamples/properties/main.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/properties/person.cpp b/examples/qml/referenceexamples/properties/person.cpp
index 30d1e46e5a..30d1e46e5a 100644
--- a/examples/qml/cppextensions/referenceexamples/properties/person.cpp
+++ b/examples/qml/referenceexamples/properties/person.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/properties/person.h b/examples/qml/referenceexamples/properties/person.h
index dd3ad4d188..dd3ad4d188 100644
--- a/examples/qml/cppextensions/referenceexamples/properties/person.h
+++ b/examples/qml/referenceexamples/properties/person.h
diff --git a/examples/qml/cppextensions/referenceexamples/properties/properties.pro b/examples/qml/referenceexamples/properties/properties.pro
index e079b1f79e..e079b1f79e 100644
--- a/examples/qml/cppextensions/referenceexamples/properties/properties.pro
+++ b/examples/qml/referenceexamples/properties/properties.pro
diff --git a/examples/qml/cppextensions/referenceexamples/properties/properties.qrc b/examples/qml/referenceexamples/properties/properties.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/qml/cppextensions/referenceexamples/properties/properties.qrc
+++ b/examples/qml/referenceexamples/properties/properties.qrc
diff --git a/examples/qml/cppextensions/referenceexamples/referenceexamples.pro b/examples/qml/referenceexamples/referenceexamples.pro
index 4bfbd488ea..4bfbd488ea 100644
--- a/examples/qml/cppextensions/referenceexamples/referenceexamples.pro
+++ b/examples/qml/referenceexamples/referenceexamples.pro
diff --git a/examples/qml/cppextensions/referenceexamples/referenceexamples.qmlproject b/examples/qml/referenceexamples/referenceexamples.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/qml/cppextensions/referenceexamples/referenceexamples.qmlproject
+++ b/examples/qml/referenceexamples/referenceexamples.qmlproject
diff --git a/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.cpp b/examples/qml/referenceexamples/signal/birthdayparty.cpp
index b9f7e15907..b9f7e15907 100644
--- a/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/signal/birthdayparty.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.h b/examples/qml/referenceexamples/signal/birthdayparty.h
index 3f1b020b5a..3f1b020b5a 100644
--- a/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.h
+++ b/examples/qml/referenceexamples/signal/birthdayparty.h
diff --git a/examples/qml/cppextensions/referenceexamples/signal/example.qml b/examples/qml/referenceexamples/signal/example.qml
index db959ffd86..db959ffd86 100644
--- a/examples/qml/cppextensions/referenceexamples/signal/example.qml
+++ b/examples/qml/referenceexamples/signal/example.qml
diff --git a/examples/qml/cppextensions/referenceexamples/signal/main.cpp b/examples/qml/referenceexamples/signal/main.cpp
index 21a26d9b67..21a26d9b67 100644
--- a/examples/qml/cppextensions/referenceexamples/signal/main.cpp
+++ b/examples/qml/referenceexamples/signal/main.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/signal/person.cpp b/examples/qml/referenceexamples/signal/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/qml/cppextensions/referenceexamples/signal/person.cpp
+++ b/examples/qml/referenceexamples/signal/person.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/signal/person.h b/examples/qml/referenceexamples/signal/person.h
index 032eca3c17..032eca3c17 100644
--- a/examples/qml/cppextensions/referenceexamples/signal/person.h
+++ b/examples/qml/referenceexamples/signal/person.h
diff --git a/examples/qml/cppextensions/referenceexamples/signal/signal.pro b/examples/qml/referenceexamples/signal/signal.pro
index d426e398a5..d426e398a5 100644
--- a/examples/qml/cppextensions/referenceexamples/signal/signal.pro
+++ b/examples/qml/referenceexamples/signal/signal.pro
diff --git a/examples/qml/cppextensions/referenceexamples/signal/signal.qrc b/examples/qml/referenceexamples/signal/signal.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/qml/cppextensions/referenceexamples/signal/signal.qrc
+++ b/examples/qml/referenceexamples/signal/signal.qrc
diff --git a/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.cpp b/examples/qml/referenceexamples/valuesource/birthdayparty.cpp
index aa8bc77116..aa8bc77116 100644
--- a/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/valuesource/birthdayparty.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.h b/examples/qml/referenceexamples/valuesource/birthdayparty.h
index f3635e899b..f3635e899b 100644
--- a/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.h
+++ b/examples/qml/referenceexamples/valuesource/birthdayparty.h
diff --git a/examples/qml/cppextensions/referenceexamples/valuesource/example.qml b/examples/qml/referenceexamples/valuesource/example.qml
index 4c25cebae3..4c25cebae3 100644
--- a/examples/qml/cppextensions/referenceexamples/valuesource/example.qml
+++ b/examples/qml/referenceexamples/valuesource/example.qml
diff --git a/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp b/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp
index d69154b57a..d69154b57a 100644
--- a/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
+++ b/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.h b/examples/qml/referenceexamples/valuesource/happybirthdaysong.h
index 19e47c28ac..19e47c28ac 100644
--- a/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
+++ b/examples/qml/referenceexamples/valuesource/happybirthdaysong.h
diff --git a/examples/qml/cppextensions/referenceexamples/valuesource/main.cpp b/examples/qml/referenceexamples/valuesource/main.cpp
index e119e719af..e119e719af 100644
--- a/examples/qml/cppextensions/referenceexamples/valuesource/main.cpp
+++ b/examples/qml/referenceexamples/valuesource/main.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/valuesource/person.cpp b/examples/qml/referenceexamples/valuesource/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/qml/cppextensions/referenceexamples/valuesource/person.cpp
+++ b/examples/qml/referenceexamples/valuesource/person.cpp
diff --git a/examples/qml/cppextensions/referenceexamples/valuesource/person.h b/examples/qml/referenceexamples/valuesource/person.h
index 032eca3c17..032eca3c17 100644
--- a/examples/qml/cppextensions/referenceexamples/valuesource/person.h
+++ b/examples/qml/referenceexamples/valuesource/person.h
diff --git a/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/qml/referenceexamples/valuesource/valuesource.pro
index afc1784d71..afc1784d71 100644
--- a/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.pro
+++ b/examples/qml/referenceexamples/valuesource/valuesource.pro
diff --git a/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.qrc b/examples/qml/referenceexamples/valuesource/valuesource.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.qrc
+++ b/examples/qml/referenceexamples/valuesource/valuesource.qrc
diff --git a/examples/qml/script/script.pro b/examples/qml/script/script.pro
deleted file mode 100644
index 98c1bbc5ee..0000000000
--- a/examples/qml/script/script.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS = \
-   shell
diff --git a/examples/qml/script/shell/main.cpp b/examples/qml/shell/main.cpp
index 4ea36f7e77..4ea36f7e77 100644
--- a/examples/qml/script/shell/main.cpp
+++ b/examples/qml/shell/main.cpp
diff --git a/examples/qml/script/shell/shell.pro b/examples/qml/shell/shell.pro
index 5f6b23862b..5f6b23862b 100644
--- a/examples/qml/script/shell/shell.pro
+++ b/examples/qml/shell/shell.pro
diff --git a/examples/qmltest/qmltest.pro b/examples/qmltest/qmltest.pro
index 40d964c20a..b98cc03c65 100644
--- a/examples/qmltest/qmltest.pro
+++ b/examples/qmltest/qmltest.pro
@@ -1,4 +1,2 @@
-TEMPLATE=app
-TARGET=tst_qmltestexample
-CONFIG += qmltestcase
-SOURCES += tst_qmltest.cpp
+TEMPLATE = subdirs
+SUBDIRS += qmltest
diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
new file mode 100644
index 0000000000..40d964c20a
--- /dev/null
+++ b/examples/qmltest/qmltest/qmltest.pro
@@ -0,0 +1,4 @@
+TEMPLATE=app
+TARGET=tst_qmltestexample
+CONFIG += qmltestcase
+SOURCES += tst_qmltest.cpp
diff --git a/examples/qmltest/tst_basic.qml b/examples/qmltest/qmltest/tst_basic.qml
index 2ff6880922..2ff6880922 100644
--- a/examples/qmltest/tst_basic.qml
+++ b/examples/qmltest/qmltest/tst_basic.qml
diff --git a/examples/qmltest/tst_item.qml b/examples/qmltest/qmltest/tst_item.qml
index 44934c2c72..44934c2c72 100644
--- a/examples/qmltest/tst_item.qml
+++ b/examples/qmltest/qmltest/tst_item.qml
diff --git a/examples/qmltest/tst_qmltest.cpp b/examples/qmltest/qmltest/tst_qmltest.cpp
index 02e2e3b5e6..02e2e3b5e6 100644
--- a/examples/qmltest/tst_qmltest.cpp
+++ b/examples/qmltest/qmltest/tst_qmltest.cpp
diff --git a/examples/quick/customitems/customitems.pro b/examples/quick/customitems/customitems.pro
new file mode 100644
index 0000000000..2349fce1e0
--- /dev/null
+++ b/examples/quick/customitems/customitems.pro
@@ -0,0 +1,13 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+    #dialcontrol \
+    #flipable \
+    glitem \
+    painteditem \
+    #progressbar \
+    #scrollbar \
+    #searchbox \
+    #slideswitch \
+    #spinner \
+    #tabwidget \
+    maskedmousearea
diff --git a/examples/tutorials/ui-components/dialcontrol/content/Dial.qml b/examples/quick/customitems/dialcontrol/content/Dial.qml
index c61adee364..c61adee364 100644
--- a/examples/tutorials/ui-components/dialcontrol/content/Dial.qml
+++ b/examples/quick/customitems/dialcontrol/content/Dial.qml
diff --git a/examples/tutorials/ui-components/dialcontrol/content/QuitButton.qml b/examples/quick/customitems/dialcontrol/content/QuitButton.qml
index 702b892d23..702b892d23 100644
--- a/examples/tutorials/ui-components/dialcontrol/content/QuitButton.qml
+++ b/examples/quick/customitems/dialcontrol/content/QuitButton.qml
diff --git a/examples/tutorials/ui-components/dialcontrol/content/background.png b/examples/quick/customitems/dialcontrol/content/background.png
index 75d555d7ab..75d555d7ab 100644
--- a/examples/tutorials/ui-components/dialcontrol/content/background.png
+++ b/examples/quick/customitems/dialcontrol/content/background.png
diff --git a/examples/tutorials/ui-components/dialcontrol/content/needle.png b/examples/quick/customitems/dialcontrol/content/needle.png
index 2d19f75039..2d19f75039 100644
--- a/examples/tutorials/ui-components/dialcontrol/content/needle.png
+++ b/examples/quick/customitems/dialcontrol/content/needle.png
diff --git a/examples/tutorials/ui-components/dialcontrol/content/needle_shadow.png b/examples/quick/customitems/dialcontrol/content/needle_shadow.png
index 8d8a928cc5..8d8a928cc5 100644
--- a/examples/tutorials/ui-components/dialcontrol/content/needle_shadow.png
+++ b/examples/quick/customitems/dialcontrol/content/needle_shadow.png
diff --git a/examples/tutorials/ui-components/dialcontrol/content/overlay.png b/examples/quick/customitems/dialcontrol/content/overlay.png
index 3860a7b590..3860a7b590 100644
--- a/examples/tutorials/ui-components/dialcontrol/content/overlay.png
+++ b/examples/quick/customitems/dialcontrol/content/overlay.png
diff --git a/examples/tutorials/ui-components/dialcontrol/content/quit.png b/examples/quick/customitems/dialcontrol/content/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/tutorials/ui-components/dialcontrol/content/quit.png
+++ b/examples/quick/customitems/dialcontrol/content/quit.png
diff --git a/examples/tutorials/ui-components/dialcontrol/dialcontrol.qml b/examples/quick/customitems/dialcontrol/dialcontrol.qml
index 467a558696..467a558696 100644
--- a/examples/tutorials/ui-components/dialcontrol/dialcontrol.qml
+++ b/examples/quick/customitems/dialcontrol/dialcontrol.qml
diff --git a/examples/tutorials/ui-components/flipable/content/5_heart.png b/examples/quick/customitems/flipable/content/5_heart.png
index fb59d81453..fb59d81453 100644
--- a/examples/tutorials/ui-components/flipable/content/5_heart.png
+++ b/examples/quick/customitems/flipable/content/5_heart.png
diff --git a/examples/tutorials/ui-components/flipable/content/9_club.png b/examples/quick/customitems/flipable/content/9_club.png
index 2545001904..2545001904 100644
--- a/examples/tutorials/ui-components/flipable/content/9_club.png
+++ b/examples/quick/customitems/flipable/content/9_club.png
diff --git a/examples/tutorials/ui-components/flipable/content/Card.qml b/examples/quick/customitems/flipable/content/Card.qml
index 6006ea14fc..6006ea14fc 100644
--- a/examples/tutorials/ui-components/flipable/content/Card.qml
+++ b/examples/quick/customitems/flipable/content/Card.qml
diff --git a/examples/tutorials/ui-components/flipable/content/back.png b/examples/quick/customitems/flipable/content/back.png
index f715d7487e..f715d7487e 100644
--- a/examples/tutorials/ui-components/flipable/content/back.png
+++ b/examples/quick/customitems/flipable/content/back.png
diff --git a/examples/tutorials/ui-components/flipable/flipable.qml b/examples/quick/customitems/flipable/flipable.qml
index 4af64afc53..4af64afc53 100644
--- a/examples/tutorials/ui-components/flipable/flipable.qml
+++ b/examples/quick/customitems/flipable/flipable.qml
diff --git a/examples/quick/openglunderqml/openglunderqml.pro b/examples/quick/customitems/glitem/glitem.pro
index 64a58b3729..64a58b3729 100644
--- a/examples/quick/openglunderqml/openglunderqml.pro
+++ b/examples/quick/customitems/glitem/glitem.pro
diff --git a/examples/quick/openglunderqml/main.cpp b/examples/quick/customitems/glitem/main.cpp
index 8d1a91bdb2..8d1a91bdb2 100644
--- a/examples/quick/openglunderqml/main.cpp
+++ b/examples/quick/customitems/glitem/main.cpp
diff --git a/examples/quick/openglunderqml/main.qml b/examples/quick/customitems/glitem/main.qml
index 66bc08bf03..66bc08bf03 100644
--- a/examples/quick/openglunderqml/main.qml
+++ b/examples/quick/customitems/glitem/main.qml
diff --git a/examples/quick/openglunderqml/squircle.cpp b/examples/quick/customitems/glitem/squircle.cpp
index b1340687f9..b1340687f9 100644
--- a/examples/quick/openglunderqml/squircle.cpp
+++ b/examples/quick/customitems/glitem/squircle.cpp
diff --git a/examples/quick/openglunderqml/squircle.h b/examples/quick/customitems/glitem/squircle.h
index 9e7a03b75b..9e7a03b75b 100644
--- a/examples/quick/openglunderqml/squircle.h
+++ b/examples/quick/customitems/glitem/squircle.h
diff --git a/examples/quick/maskedmousearea/images/cloud_1.png b/examples/quick/customitems/maskedmousearea/images/cloud_1.png
index 87c54af253..87c54af253 100644
--- a/examples/quick/maskedmousearea/images/cloud_1.png
+++ b/examples/quick/customitems/maskedmousearea/images/cloud_1.png
diff --git a/examples/quick/maskedmousearea/images/cloud_2.png b/examples/quick/customitems/maskedmousearea/images/cloud_2.png
index 981bbd2630..981bbd2630 100644
--- a/examples/quick/maskedmousearea/images/cloud_2.png
+++ b/examples/quick/customitems/maskedmousearea/images/cloud_2.png
diff --git a/examples/quick/maskedmousearea/images/moon.png b/examples/quick/customitems/maskedmousearea/images/moon.png
index 0a8037dd85..0a8037dd85 100644
--- a/examples/quick/maskedmousearea/images/moon.png
+++ b/examples/quick/customitems/maskedmousearea/images/moon.png
diff --git a/examples/quick/maskedmousearea/main.cpp b/examples/quick/customitems/maskedmousearea/main.cpp
index 407497e640..407497e640 100644
--- a/examples/quick/maskedmousearea/main.cpp
+++ b/examples/quick/customitems/maskedmousearea/main.cpp
diff --git a/examples/quick/maskedmousearea/maskedmousearea.cpp b/examples/quick/customitems/maskedmousearea/maskedmousearea.cpp
index 3f872a66f6..3f872a66f6 100644
--- a/examples/quick/maskedmousearea/maskedmousearea.cpp
+++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.cpp
diff --git a/examples/quick/maskedmousearea/maskedmousearea.h b/examples/quick/customitems/maskedmousearea/maskedmousearea.h
index 045d02d6f0..045d02d6f0 100644
--- a/examples/quick/maskedmousearea/maskedmousearea.h
+++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.h
diff --git a/examples/quick/maskedmousearea/maskedmousearea.pro b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro
index 1623f7919b..1623f7919b 100644
--- a/examples/quick/maskedmousearea/maskedmousearea.pro
+++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro
diff --git a/examples/quick/maskedmousearea/maskedmousearea.qml b/examples/quick/customitems/maskedmousearea/maskedmousearea.qml
index 82d351b04f..82d351b04f 100644
--- a/examples/quick/maskedmousearea/maskedmousearea.qml
+++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.qml
diff --git a/examples/quick/maskedmousearea/maskedmousearea.qmlproject b/examples/quick/customitems/maskedmousearea/maskedmousearea.qmlproject
index 709c19866f..709c19866f 100644
--- a/examples/quick/maskedmousearea/maskedmousearea.qmlproject
+++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.qmlproject
diff --git a/examples/quick/painteditem/textballoons/TextBalloonPlugin/plugin.h b/examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h
index a039339ba4..a039339ba4 100644
--- a/examples/quick/painteditem/textballoons/TextBalloonPlugin/plugin.h
+++ b/examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h
diff --git a/examples/quick/painteditem/textballoons/TextBalloonPlugin/qmldir b/examples/quick/customitems/painteditem/TextBalloonPlugin/qmldir
index e8a08ae9d3..e8a08ae9d3 100644
--- a/examples/quick/painteditem/textballoons/TextBalloonPlugin/qmldir
+++ b/examples/quick/customitems/painteditem/TextBalloonPlugin/qmldir
diff --git a/examples/quick/painteditem/textballoons/textballoons.pro b/examples/quick/customitems/painteditem/painteditem.pro
index d612048ee8..9526817146 100644
--- a/examples/quick/painteditem/textballoons/textballoons.pro
+++ b/examples/quick/customitems/painteditem/painteditem.pro
@@ -16,10 +16,10 @@ DESTDIR = TextBalloonPlugin
 qdeclarativesources.files += \
     TextBalloonPlugin/qmldir
 
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/painteditem/textballoons/TextBalloonPlugin
+qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/painteditem/TextBalloonPlugin
  
 sources.files = textballoons.qml
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/painteditem/textballoons
-target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/painteditem/textballoons/TextBalloonPlugin
+sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/painteditem
+target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/painteditem/TextBalloonPlugin
 
 INSTALLS = qdeclarativesources sources target
diff --git a/examples/quick/painteditem/textballoons/textballoon.cpp b/examples/quick/customitems/painteditem/textballoon.cpp
index d097adfe1b..d097adfe1b 100644
--- a/examples/quick/painteditem/textballoons/textballoon.cpp
+++ b/examples/quick/customitems/painteditem/textballoon.cpp
diff --git a/examples/quick/painteditem/textballoons/textballoon.h b/examples/quick/customitems/painteditem/textballoon.h
index 93ed0a7105..93ed0a7105 100644
--- a/examples/quick/painteditem/textballoons/textballoon.h
+++ b/examples/quick/customitems/painteditem/textballoon.h
diff --git a/examples/quick/painteditem/textballoons/textballoons.qml b/examples/quick/customitems/painteditem/textballoons.qml
index d5151c9553..d5151c9553 100644
--- a/examples/quick/painteditem/textballoons/textballoons.qml
+++ b/examples/quick/customitems/painteditem/textballoons.qml
diff --git a/examples/tutorials/ui-components/progressbar/content/ProgressBar.qml b/examples/quick/customitems/progressbar/content/ProgressBar.qml
index c9be8d7336..c9be8d7336 100644
--- a/examples/tutorials/ui-components/progressbar/content/ProgressBar.qml
+++ b/examples/quick/customitems/progressbar/content/ProgressBar.qml
diff --git a/examples/tutorials/ui-components/progressbar/content/background.png b/examples/quick/customitems/progressbar/content/background.png
index 9044226f85..9044226f85 100644
--- a/examples/tutorials/ui-components/progressbar/content/background.png
+++ b/examples/quick/customitems/progressbar/content/background.png
diff --git a/examples/tutorials/ui-components/progressbar/main.qml b/examples/quick/customitems/progressbar/main.qml
index 367e4c1265..367e4c1265 100644
--- a/examples/tutorials/ui-components/progressbar/main.qml
+++ b/examples/quick/customitems/progressbar/main.qml
diff --git a/examples/tutorials/ui-components/scrollbar/ScrollBar.qml b/examples/quick/customitems/scrollbar/ScrollBar.qml
index a3d0d3841c..a3d0d3841c 100644
--- a/examples/tutorials/ui-components/scrollbar/ScrollBar.qml
+++ b/examples/quick/customitems/scrollbar/ScrollBar.qml
diff --git a/examples/tutorials/ui-components/scrollbar/main.qml b/examples/quick/customitems/scrollbar/main.qml
index a7d602b437..a7d602b437 100644
--- a/examples/tutorials/ui-components/scrollbar/main.qml
+++ b/examples/quick/customitems/scrollbar/main.qml
diff --git a/examples/tutorials/ui-components/scrollbar/pics/niagara_falls.jpg b/examples/quick/customitems/scrollbar/pics/niagara_falls.jpg
index e625c0d3e6..e625c0d3e6 100644
--- a/examples/tutorials/ui-components/scrollbar/pics/niagara_falls.jpg
+++ b/examples/quick/customitems/scrollbar/pics/niagara_falls.jpg
diff --git a/examples/tutorials/ui-components/scrollbar/scrollbar.qmlproject b/examples/quick/customitems/scrollbar/scrollbar.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/tutorials/ui-components/scrollbar/scrollbar.qmlproject
+++ b/examples/quick/customitems/scrollbar/scrollbar.qmlproject
diff --git a/examples/tutorials/ui-components/searchbox/SearchBox.qml b/examples/quick/customitems/searchbox/SearchBox.qml
index 6f6f486412..6f6f486412 100644
--- a/examples/tutorials/ui-components/searchbox/SearchBox.qml
+++ b/examples/quick/customitems/searchbox/SearchBox.qml
diff --git a/examples/tutorials/ui-components/searchbox/images/clear.png b/examples/quick/customitems/searchbox/images/clear.png
index 91eb270695..91eb270695 100644
--- a/examples/tutorials/ui-components/searchbox/images/clear.png
+++ b/examples/quick/customitems/searchbox/images/clear.png
diff --git a/examples/tutorials/ui-components/searchbox/images/lineedit-bg-focus.png b/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png
index bbfac38d2d..bbfac38d2d 100644
--- a/examples/tutorials/ui-components/searchbox/images/lineedit-bg-focus.png
+++ b/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png
diff --git a/examples/tutorials/ui-components/searchbox/images/lineedit-bg.png b/examples/quick/customitems/searchbox/images/lineedit-bg.png
index 9044226f85..9044226f85 100644
--- a/examples/tutorials/ui-components/searchbox/images/lineedit-bg.png
+++ b/examples/quick/customitems/searchbox/images/lineedit-bg.png
diff --git a/examples/tutorials/ui-components/searchbox/main.qml b/examples/quick/customitems/searchbox/main.qml
index 6e9731cf9c..6e9731cf9c 100644
--- a/examples/tutorials/ui-components/searchbox/main.qml
+++ b/examples/quick/customitems/searchbox/main.qml
diff --git a/examples/tutorials/ui-components/searchbox/searchbox.qmlproject b/examples/quick/customitems/searchbox/searchbox.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/tutorials/ui-components/searchbox/searchbox.qmlproject
+++ b/examples/quick/customitems/searchbox/searchbox.qmlproject
diff --git a/examples/tutorials/ui-components/slideswitch/content/Switch.qml b/examples/quick/customitems/slideswitch/content/Switch.qml
index 981fc16673..981fc16673 100644
--- a/examples/tutorials/ui-components/slideswitch/content/Switch.qml
+++ b/examples/quick/customitems/slideswitch/content/Switch.qml
diff --git a/examples/tutorials/ui-components/slideswitch/content/background.png b/examples/quick/customitems/slideswitch/content/background.png
index d736815870..d736815870 100644
--- a/examples/tutorials/ui-components/slideswitch/content/background.png
+++ b/examples/quick/customitems/slideswitch/content/background.png
diff --git a/examples/tutorials/ui-components/slideswitch/content/background.svg b/examples/quick/customitems/slideswitch/content/background.svg
index f920d3e47a..f920d3e47a 100644
--- a/examples/tutorials/ui-components/slideswitch/content/background.svg
+++ b/examples/quick/customitems/slideswitch/content/background.svg
diff --git a/examples/tutorials/ui-components/slideswitch/content/knob.png b/examples/quick/customitems/slideswitch/content/knob.png
index ee0a436f84..ee0a436f84 100644
--- a/examples/tutorials/ui-components/slideswitch/content/knob.png
+++ b/examples/quick/customitems/slideswitch/content/knob.png
diff --git a/examples/tutorials/ui-components/slideswitch/content/knob.svg b/examples/quick/customitems/slideswitch/content/knob.svg
index fb6933718e..fb6933718e 100644
--- a/examples/tutorials/ui-components/slideswitch/content/knob.svg
+++ b/examples/quick/customitems/slideswitch/content/knob.svg
diff --git a/examples/tutorials/ui-components/slideswitch/slideswitch.qml b/examples/quick/customitems/slideswitch/slideswitch.qml
index 60a331407c..60a331407c 100644
--- a/examples/tutorials/ui-components/slideswitch/slideswitch.qml
+++ b/examples/quick/customitems/slideswitch/slideswitch.qml
diff --git a/examples/tutorials/ui-components/spinner/content/Spinner.qml b/examples/quick/customitems/spinner/content/Spinner.qml
index d7bbeb33ee..d7bbeb33ee 100644
--- a/examples/tutorials/ui-components/spinner/content/Spinner.qml
+++ b/examples/quick/customitems/spinner/content/Spinner.qml
diff --git a/examples/tutorials/ui-components/spinner/content/spinner-bg.png b/examples/quick/customitems/spinner/content/spinner-bg.png
index b3556f1f9f..b3556f1f9f 100644
--- a/examples/tutorials/ui-components/spinner/content/spinner-bg.png
+++ b/examples/quick/customitems/spinner/content/spinner-bg.png
diff --git a/examples/tutorials/ui-components/spinner/content/spinner-select.png b/examples/quick/customitems/spinner/content/spinner-select.png
index 95a17a1fe2..95a17a1fe2 100644
--- a/examples/tutorials/ui-components/spinner/content/spinner-select.png
+++ b/examples/quick/customitems/spinner/content/spinner-select.png
diff --git a/examples/tutorials/ui-components/spinner/main.qml b/examples/quick/customitems/spinner/main.qml
index 7584c98396..7584c98396 100644
--- a/examples/tutorials/ui-components/spinner/main.qml
+++ b/examples/quick/customitems/spinner/main.qml
diff --git a/examples/tutorials/ui-components/spinner/spinner.qmlproject b/examples/quick/customitems/spinner/spinner.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/tutorials/ui-components/spinner/spinner.qmlproject
+++ b/examples/quick/customitems/spinner/spinner.qmlproject
diff --git a/examples/tutorials/ui-components/tabwidget/TabWidget.qml b/examples/quick/customitems/tabwidget/TabWidget.qml
index 560ed1f58a..560ed1f58a 100644
--- a/examples/tutorials/ui-components/tabwidget/TabWidget.qml
+++ b/examples/quick/customitems/tabwidget/TabWidget.qml
diff --git a/examples/tutorials/ui-components/tabwidget/main.qml b/examples/quick/customitems/tabwidget/main.qml
index df99c11b7d..df99c11b7d 100644
--- a/examples/tutorials/ui-components/tabwidget/main.qml
+++ b/examples/quick/customitems/tabwidget/main.qml
diff --git a/examples/tutorials/ui-components/tabwidget/tab.png b/examples/quick/customitems/tabwidget/tab.png
index ad8021605f..ad8021605f 100644
--- a/examples/tutorials/ui-components/tabwidget/tab.png
+++ b/examples/quick/customitems/tabwidget/tab.png
diff --git a/examples/tutorials/ui-components/tabwidget/tabwidget.qmlproject b/examples/quick/customitems/tabwidget/tabwidget.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/tutorials/ui-components/tabwidget/tabwidget.qmlproject
+++ b/examples/quick/customitems/tabwidget/tabwidget.qmlproject
diff --git a/examples/quick/painteditem/painteditem.pro b/examples/quick/painteditem/painteditem.pro
deleted file mode 100644
index e3afd6b0f0..0000000000
--- a/examples/quick/painteditem/painteditem.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS = \
-    smile \
-    textballoons
diff --git a/examples/quick/painteditem/smile/main.cpp b/examples/quick/painteditem/smile/main.cpp
deleted file mode 100644
index 1c7888b10b..0000000000
--- a/examples/quick/painteditem/smile/main.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QGuiApplication>
-#include <QPainter>
-#include <QtQml/qqml.h>
-#include <QtQuick/qquickview.h>
-#include <QtQuick/qquickpainteditem.h>
-class MyPaintItem : public QQuickPaintedItem
-{
-    Q_OBJECT
-    Q_PROPERTY(QString face READ face WRITE setFace NOTIFY faceChanged)
-public:
-    MyPaintItem()
-      : QQuickPaintedItem()
-      , m_face(QLatin1String(":-)"))
-    {
-        setAntialiasing(true);
-    }
-    QString face() const {return m_face;}
-    void setFace(const QString &face) {
-       if (m_face != face) {
-          m_face = face;
-          emit faceChanged();
-       }
-    }
-    virtual void paint(QPainter *p)
-    {
-        QRectF rect(0, 0, width(), height());
-        rect.adjust(10, 10, -10, -10);
-        p->setPen(QPen(Qt::black, 20));
-        p->setBrush(Qt::yellow);
-        p->drawEllipse(rect);
-        p->setPen(Qt::black);
-        p->setFont(QFont(QLatin1String("Times"), qRound(rect.height() / 2)));
-        p->drawText(rect, Qt::AlignCenter, m_face);
-    }
-signals:
-    void faceChanged();
-private:
-    QString m_face;
-};
-
-int main(int argc, char ** argv)
-{
-    QGuiApplication app(argc, argv);
-
-    qmlRegisterType<MyPaintItem>("MyModule", 1, 0, "MyPaintItem");
-
-    QQuickView view;
-    view.setResizeMode(QQuickView::SizeRootObjectToView);
-    view.setSource(QUrl::fromLocalFile("smile.qml"));
-    view.show();
-    view.raise();
-
-    return app.exec();
-}
-
-#include "main.moc"
diff --git a/examples/quick/painteditem/smile/smile.pro b/examples/quick/painteditem/smile/smile.pro
deleted file mode 100644
index b1af4ee0ad..0000000000
--- a/examples/quick/painteditem/smile/smile.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-TARGET = painteditem
-
-QT += qml quick
-
-macx: CONFIG -= app_bundle
-
-SOURCES += main.cpp
-
-CONFIG += console
-
diff --git a/examples/quick/painteditem/smile/smile.qml b/examples/quick/painteditem/smile/smile.qml
deleted file mode 100644
index c30da1b944..0000000000
--- a/examples/quick/painteditem/smile/smile.qml
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import MyModule 1.0
-/*!
-    \title QtQuick Examples - Painted Smile
-    \example quick/painteditem/smile
-    \brief This is a simple example the draws a smile with QPainter
-*/
-
-Rectangle {
-    width: 320
-    height: 480
-    gradient: Gradient {
-        GradientStop { position: 0.0; color: "#00249a" }
-        GradientStop { position: 0.7; color: "#ffd94f" }
-        GradientStop { position: 1.0; color: "#ffa322" }
-    }
-    Grid {
-        columns: 2
-        Repeater {
-            model: 6
-            delegate: MyPaintItem {
-                renderTarget:PaintedItem.Image
-                clip:true
-                width:160
-                height:160
-                smooth: true
-                MouseArea {
-                  anchors.fill:parent
-                  onClicked: {
-                   if (parent.face == ":-)")
-                      parent.face = ":-(";
-                   else
-                      parent.face = ":-)";
-                   parent.update()
-                  }
-                }
-            }
-        }
-    }
-}
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
index 8357e8e389..809ddea552 100644
--- a/examples/quick/quick.pro
+++ b/examples/quick/quick.pro
@@ -7,11 +7,10 @@ SUBDIRS = accessibility \
             keyinteraction \
             modelviews \
             mousearea \
-            openglunderqml \
-            painteditem \
             positioners \
             righttoleft \
             shadereffects \
             text \
             threading \
-            touchinteraction
+            touchinteraction \
+            customitems
diff --git a/examples/window/window.pro b/examples/window/window.pro
index c4518418f6..b4e3886c87 100644
--- a/examples/window/window.pro
+++ b/examples/window/window.pro
@@ -1,5 +1,4 @@
-TEMPLATE = app
-CONFIG += qt
-QT += qml
-
-SOURCES += window.cpp
+TEMPLATE = subdirs
+SUBDIRS += \
+    #screen \
+    window
diff --git a/examples/window/Window.qml b/examples/window/window/Window.qml
index 48478458c6..48478458c6 100644
--- a/examples/window/Window.qml
+++ b/examples/window/window/Window.qml
diff --git a/examples/window/standalone.qml b/examples/window/window/standalone.qml
index 335cf7b635..335cf7b635 100644
--- a/examples/window/standalone.qml
+++ b/examples/window/window/standalone.qml
diff --git a/examples/window/window.cpp b/examples/window/window/window.cpp
index 2112ab8f45..2112ab8f45 100644
--- a/examples/window/window.cpp
+++ b/examples/window/window/window.cpp
diff --git a/examples/window/window/window.pro b/examples/window/window/window.pro
new file mode 100644
index 0000000000..c4518418f6
--- /dev/null
+++ b/examples/window/window/window.pro
@@ -0,0 +1,5 @@
+TEMPLATE = app
+CONFIG += qt
+QT += qml
+
+SOURCES += window.cpp