117 files changed, 6 insertions, 28 deletions
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