Move examples into separate quick/controls directory

This makes sure all examples are in a separate directory for the
Qt source packages. It also is in line with how the other repositories
are structured.

Task-number: QTBUG-30886
Change-Id: Idc2856e5dfaf467c8cb9764aee327a3b20c7b2d0
Reviewed-by: Caroline Chao <caroline.chao@digia.com>

99 files changed, 21 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index 5d0d1b90..987693b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 # This file is used to ignore files which are generated in the Qt build system
 # ----------------------------------------------------------------------------
 
-examples/ApplicationTemplate/application
-examples/text/text
+examples/quick/controls/ApplicationTemplate/application
+examples/quick/controls/text/text
 tests/auto/activeFocusOnTab/tst_activeFocusOnTab
 tests/auto/controls/tst_controls
 tests/auto/qtdesktop/tst_qtdesktop
diff --git a/examples/examples.pro b/examples/examples.pro
index 0be155cd..505dc0c2 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,13 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS += \
-    gallery \
-    splitview \
-    stackview \
-    tableview \
-    touch
-
-qtHaveModule(widgets) {
-    SUBDIRS += text \
-        ApplicationTemplate
-}
+SUBDIRS += quick/controls
diff --git a/examples/ApplicationTemplate/ApplicationTemplate.pro b/examples/quick/controls/ApplicationTemplate/ApplicationTemplate.pro
index f877756d..f877756d 100644
--- a/examples/ApplicationTemplate/ApplicationTemplate.pro
+++ b/examples/quick/controls/ApplicationTemplate/ApplicationTemplate.pro
diff --git a/examples/ApplicationTemplate/main.cpp b/examples/quick/controls/ApplicationTemplate/main.cpp
index ef8dd804..ef8dd804 100644
--- a/examples/ApplicationTemplate/main.cpp
+++ b/examples/quick/controls/ApplicationTemplate/main.cpp
diff --git a/examples/ApplicationTemplate/qml/images/qt_icon.png b/examples/quick/controls/ApplicationTemplate/qml/images/qt_icon.png
index 229cdb00..229cdb00 100644
--- a/examples/ApplicationTemplate/qml/images/qt_icon.png
+++ b/examples/quick/controls/ApplicationTemplate/qml/images/qt_icon.png
diff --git a/examples/ApplicationTemplate/qml/main.qml b/examples/quick/controls/ApplicationTemplate/qml/main.qml
index 0c92e9ca..0c92e9ca 100644
--- a/examples/ApplicationTemplate/qml/main.qml
+++ b/examples/quick/controls/ApplicationTemplate/qml/main.qml
diff --git a/examples/ApplicationTemplate/resources.qrc b/examples/quick/controls/ApplicationTemplate/resources.qrc
index dfdba433..dfdba433 100644
--- a/examples/ApplicationTemplate/resources.qrc
+++ b/examples/quick/controls/ApplicationTemplate/resources.qrc
diff --git a/examples/basiclayouts/basiclayouts.qmlproject b/examples/quick/controls/basiclayouts/basiclayouts.qmlproject
index e5a8bf02..e5a8bf02 100644
--- a/examples/basiclayouts/basiclayouts.qmlproject
+++ b/examples/quick/controls/basiclayouts/basiclayouts.qmlproject
diff --git a/examples/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml
index 7b83a2e0..7b83a2e0 100644
--- a/examples/basiclayouts/main.qml
+++ b/examples/quick/controls/basiclayouts/main.qml
diff --git a/examples/quick/controls/controls.pro b/examples/quick/controls/controls.pro
new file mode 100644
index 00000000..0be155cd
--- /dev/null
+++ b/examples/quick/controls/controls.pro
@@ -0,0 +1,13 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    gallery \
+    splitview \
+    stackview \
+    tableview \
+    touch
+
+qtHaveModule(widgets) {
+    SUBDIRS += text \
+        ApplicationTemplate
+}
diff --git a/examples/gallery/content/ChildWindow.qml b/examples/quick/controls/gallery/content/ChildWindow.qml
index 5473e834..5473e834 100644
--- a/examples/gallery/content/ChildWindow.qml
+++ b/examples/quick/controls/gallery/content/ChildWindow.qml
diff --git a/examples/gallery/content/Controls.qml b/examples/quick/controls/gallery/content/Controls.qml
index abcebbeb..abcebbeb 100644
--- a/examples/gallery/content/Controls.qml
+++ b/examples/quick/controls/gallery/content/Controls.qml
diff --git a/examples/gallery/content/ImageViewer.qml b/examples/quick/controls/gallery/content/ImageViewer.qml
index 0b045bf6..0b045bf6 100644
--- a/examples/gallery/content/ImageViewer.qml
+++ b/examples/quick/controls/gallery/content/ImageViewer.qml
diff --git a/examples/gallery/content/ModelView.qml b/examples/quick/controls/gallery/content/ModelView.qml
index 237604e5..237604e5 100644
--- a/examples/gallery/content/ModelView.qml
+++ b/examples/quick/controls/gallery/content/ModelView.qml
diff --git a/examples/gallery/content/Panel.qml b/examples/quick/controls/gallery/content/Panel.qml
index bdb10f83..bdb10f83 100644
--- a/examples/gallery/content/Panel.qml
+++ b/examples/quick/controls/gallery/content/Panel.qml
diff --git a/examples/gallery/content/Styles.qml b/examples/quick/controls/gallery/content/Styles.qml
index 618b2d7f..618b2d7f 100644
--- a/examples/gallery/content/Styles.qml
+++ b/examples/quick/controls/gallery/content/Styles.qml
diff --git a/examples/gallery/gallery.pro b/examples/quick/controls/gallery/gallery.pro
index 82f8b3e2..82f8b3e2 100644
--- a/examples/gallery/gallery.pro
+++ b/examples/quick/controls/gallery/gallery.pro
diff --git a/examples/gallery/gallery.qmlproject b/examples/quick/controls/gallery/gallery.qmlproject
index e5a8bf02..e5a8bf02 100644
--- a/examples/gallery/gallery.qmlproject
+++ b/examples/quick/controls/gallery/gallery.qmlproject
diff --git a/examples/gallery/images/document-open.png b/examples/quick/controls/gallery/images/document-open.png
index f35f2583..f35f2583 100644
--- a/examples/gallery/images/document-open.png
+++ b/examples/quick/controls/gallery/images/document-open.png
diff --git a/examples/gallery/images/document-open@2x.png b/examples/quick/controls/gallery/images/document-open@2x.png
index 9fdbb665..9fdbb665 100644
--- a/examples/gallery/images/document-open@2x.png
+++ b/examples/quick/controls/gallery/images/document-open@2x.png
diff --git a/examples/gallery/images/document-save-as.png b/examples/quick/controls/gallery/images/document-save-as.png
index 5c9f6b34..5c9f6b34 100644
--- a/examples/gallery/images/document-save-as.png
+++ b/examples/quick/controls/gallery/images/document-save-as.png
diff --git a/examples/gallery/images/document-save-as@2x.png b/examples/quick/controls/gallery/images/document-save-as@2x.png
index a15e34c9..a15e34c9 100644
--- a/examples/gallery/images/document-save-as@2x.png
+++ b/examples/quick/controls/gallery/images/document-save-as@2x.png
diff --git a/examples/gallery/images/folder_new.png b/examples/quick/controls/gallery/images/folder_new.png
index 8d8bb9bd..8d8bb9bd 100644
--- a/examples/gallery/images/folder_new.png
+++ b/examples/quick/controls/gallery/images/folder_new.png
diff --git a/examples/gallery/images/go-next.png b/examples/quick/controls/gallery/images/go-next.png
index a68e2db7..a68e2db7 100644
--- a/examples/gallery/images/go-next.png
+++ b/examples/quick/controls/gallery/images/go-next.png
diff --git a/examples/gallery/images/go-previous.png b/examples/quick/controls/gallery/images/go-previous.png
index c37bc041..c37bc041 100644
--- a/examples/gallery/images/go-previous.png
+++ b/examples/quick/controls/gallery/images/go-previous.png
diff --git a/examples/gallery/images/page.png b/examples/quick/controls/gallery/images/page.png
index b46f205d..b46f205d 100644
--- a/examples/gallery/images/page.png
+++ b/examples/quick/controls/gallery/images/page.png
diff --git a/examples/gallery/images/panel.png b/examples/quick/controls/gallery/images/panel.png
index 02d655eb..02d655eb 100644
--- a/examples/gallery/images/panel.png
+++ b/examples/quick/controls/gallery/images/panel.png
diff --git a/examples/gallery/images/preferences-system.png b/examples/quick/controls/gallery/images/preferences-system.png
index 6e52db7c..6e52db7c 100644
--- a/examples/gallery/images/preferences-system.png
+++ b/examples/quick/controls/gallery/images/preferences-system.png
diff --git a/examples/gallery/images/process-stop.png b/examples/quick/controls/gallery/images/process-stop.png
index e7a8d172..e7a8d172 100644
--- a/examples/gallery/images/process-stop.png
+++ b/examples/quick/controls/gallery/images/process-stop.png
diff --git a/examples/gallery/images/tab.png b/examples/quick/controls/gallery/images/tab.png
index 74fefab7..74fefab7 100644
--- a/examples/gallery/images/tab.png
+++ b/examples/quick/controls/gallery/images/tab.png
diff --git a/examples/gallery/images/tab_selected.png b/examples/quick/controls/gallery/images/tab_selected.png
index 665400cc..665400cc 100644
--- a/examples/gallery/images/tab_selected.png
+++ b/examples/quick/controls/gallery/images/tab_selected.png
diff --git a/examples/gallery/images/toplevel_window.png b/examples/quick/controls/gallery/images/toplevel_window.png
index 4dc6a8ce..4dc6a8ce 100644
--- a/examples/gallery/images/toplevel_window.png
+++ b/examples/quick/controls/gallery/images/toplevel_window.png
diff --git a/examples/gallery/images/view-refresh.png b/examples/quick/controls/gallery/images/view-refresh.png
index 606ea9eb..606ea9eb 100644
--- a/examples/gallery/images/view-refresh.png
+++ b/examples/quick/controls/gallery/images/view-refresh.png
diff --git a/examples/gallery/images/window-new.png b/examples/quick/controls/gallery/images/window-new.png
index e091702e..e091702e 100644
--- a/examples/gallery/images/window-new.png
+++ b/examples/quick/controls/gallery/images/window-new.png
diff --git a/examples/gallery/images/window-new@2x.png b/examples/quick/controls/gallery/images/window-new@2x.png
index 36503018..36503018 100644
--- a/examples/gallery/images/window-new@2x.png
+++ b/examples/quick/controls/gallery/images/window-new@2x.png
diff --git a/examples/gallery/main.qml b/examples/quick/controls/gallery/main.qml
index aff3cb4c..aff3cb4c 100644
--- a/examples/gallery/main.qml
+++ b/examples/quick/controls/gallery/main.qml
diff --git a/examples/splitview/main.qml b/examples/quick/controls/splitview/main.qml
index f035e644..f035e644 100644
--- a/examples/splitview/main.qml
+++ b/examples/quick/controls/splitview/main.qml
diff --git a/examples/splitview/splitview.pro b/examples/quick/controls/splitview/splitview.pro
index 8b88e385..8b88e385 100644
--- a/examples/splitview/splitview.pro
+++ b/examples/quick/controls/splitview/splitview.pro
diff --git a/examples/splitview/splitview.qmlproject b/examples/quick/controls/splitview/splitview.qmlproject
index e5a8bf02..e5a8bf02 100644
--- a/examples/splitview/splitview.qmlproject
+++ b/examples/quick/controls/splitview/splitview.qmlproject
diff --git a/examples/stackview/ButtonMenu.qml b/examples/quick/controls/stackview/ButtonMenu.qml
index c1608f7e..c1608f7e 100644
--- a/examples/stackview/ButtonMenu.qml
+++ b/examples/quick/controls/stackview/ButtonMenu.qml
diff --git a/examples/stackview/View.qml b/examples/quick/controls/stackview/View.qml
index e713e0e5..e713e0e5 100644
--- a/examples/stackview/View.qml
+++ b/examples/quick/controls/stackview/View.qml
diff --git a/examples/stackview/main.qml b/examples/quick/controls/stackview/main.qml
index af016fb2..af016fb2 100644
--- a/examples/stackview/main.qml
+++ b/examples/quick/controls/stackview/main.qml
diff --git a/examples/stackview/stackview.pro b/examples/quick/controls/stackview/stackview.pro
index 9d02e4c7..9d02e4c7 100644
--- a/examples/stackview/stackview.pro
+++ b/examples/quick/controls/stackview/stackview.pro
diff --git a/examples/stackview/stackview.qmlproject b/examples/quick/controls/stackview/stackview.qmlproject
index e5a8bf02..e5a8bf02 100644
--- a/examples/stackview/stackview.qmlproject
+++ b/examples/quick/controls/stackview/stackview.qmlproject
diff --git a/examples/tableview/images/header.png b/examples/quick/controls/tableview/images/header.png
index dba66460..dba66460 100644
--- a/examples/tableview/images/header.png
+++ b/examples/quick/controls/tableview/images/header.png
diff --git a/examples/tableview/images/selectedrow.png b/examples/quick/controls/tableview/images/selectedrow.png
index 71192ea4..71192ea4 100644
--- a/examples/tableview/images/selectedrow.png
+++ b/examples/quick/controls/tableview/images/selectedrow.png
diff --git a/examples/tableview/main.qml b/examples/quick/controls/tableview/main.qml
index 92901bf6..92901bf6 100644
--- a/examples/tableview/main.qml
+++ b/examples/quick/controls/tableview/main.qml
diff --git a/examples/tableview/tableview.pro b/examples/quick/controls/tableview/tableview.pro
index 8b88e385..8b88e385 100644
--- a/examples/tableview/tableview.pro
+++ b/examples/quick/controls/tableview/tableview.pro
diff --git a/examples/tableview/tableview.qmlproject b/examples/quick/controls/tableview/tableview.qmlproject
index e5a8bf02..e5a8bf02 100644
--- a/examples/tableview/tableview.qmlproject
+++ b/examples/quick/controls/tableview/tableview.qmlproject
diff --git a/examples/text/example.html b/examples/quick/controls/text/example.html
index 0560897b..0560897b 100644
--- a/examples/text/example.html
+++ b/examples/quick/controls/text/example.html
diff --git a/examples/text/qml/images/editcopy.png b/examples/quick/controls/text/qml/images/editcopy.png
index f5513644..f5513644 100644
--- a/examples/text/qml/images/editcopy.png
+++ b/examples/quick/controls/text/qml/images/editcopy.png
diff --git a/examples/text/qml/images/editcut.png b/examples/quick/controls/text/qml/images/editcut.png
index a784fd57..a784fd57 100644
--- a/examples/text/qml/images/editcut.png
+++ b/examples/quick/controls/text/qml/images/editcut.png
diff --git a/examples/text/qml/images/editpaste.png b/examples/quick/controls/text/qml/images/editpaste.png
index 64c0b2d6..64c0b2d6 100644
--- a/examples/text/qml/images/editpaste.png
+++ b/examples/quick/controls/text/qml/images/editpaste.png
diff --git a/examples/text/qml/images/editredo.png b/examples/quick/controls/text/qml/images/editredo.png
index 8875bf24..8875bf24 100644
--- a/examples/text/qml/images/editredo.png
+++ b/examples/quick/controls/text/qml/images/editredo.png
diff --git a/examples/text/qml/images/editundo.png b/examples/quick/controls/text/qml/images/editundo.png
index a3bd5e0b..a3bd5e0b 100644
--- a/examples/text/qml/images/editundo.png
+++ b/examples/quick/controls/text/qml/images/editundo.png
diff --git a/examples/text/qml/images/exportpdf.png b/examples/quick/controls/text/qml/images/exportpdf.png
index ebb44e6b..ebb44e6b 100644
--- a/examples/text/qml/images/exportpdf.png
+++ b/examples/quick/controls/text/qml/images/exportpdf.png
diff --git a/examples/text/qml/images/filenew.png b/examples/quick/controls/text/qml/images/filenew.png
index d3882c7b..d3882c7b 100644
--- a/examples/text/qml/images/filenew.png
+++ b/examples/quick/controls/text/qml/images/filenew.png
diff --git a/examples/text/qml/images/fileopen.png b/examples/quick/controls/text/qml/images/fileopen.png
index fc06c5ec..fc06c5ec 100644
--- a/examples/text/qml/images/fileopen.png
+++ b/examples/quick/controls/text/qml/images/fileopen.png
diff --git a/examples/text/qml/images/fileprint.png b/examples/quick/controls/text/qml/images/fileprint.png
index 10ca56c8..10ca56c8 100644
--- a/examples/text/qml/images/fileprint.png
+++ b/examples/quick/controls/text/qml/images/fileprint.png
diff --git a/examples/text/qml/images/filesave.png b/examples/quick/controls/text/qml/images/filesave.png
index b41ecf53..b41ecf53 100644
--- a/examples/text/qml/images/filesave.png
+++ b/examples/quick/controls/text/qml/images/filesave.png
diff --git a/examples/text/qml/images/logo32.png b/examples/quick/controls/text/qml/images/logo32.png
index 5f91e987..5f91e987 100644
--- a/examples/text/qml/images/logo32.png
+++ b/examples/quick/controls/text/qml/images/logo32.png
diff --git a/examples/text/qml/images/textbold.png b/examples/quick/controls/text/qml/images/textbold.png
index 38400bd1..38400bd1 100644
--- a/examples/text/qml/images/textbold.png
+++ b/examples/quick/controls/text/qml/images/textbold.png
diff --git a/examples/text/qml/images/textcenter.png b/examples/quick/controls/text/qml/images/textcenter.png
index 2ef5b2ee..2ef5b2ee 100644
--- a/examples/text/qml/images/textcenter.png
+++ b/examples/quick/controls/text/qml/images/textcenter.png
diff --git a/examples/text/qml/images/textitalic.png b/examples/quick/controls/text/qml/images/textitalic.png
index 0170ee26..0170ee26 100644
--- a/examples/text/qml/images/textitalic.png
+++ b/examples/quick/controls/text/qml/images/textitalic.png
diff --git a/examples/text/qml/images/textjustify.png b/examples/quick/controls/text/qml/images/textjustify.png
index 39cd6c1a..39cd6c1a 100644
--- a/examples/text/qml/images/textjustify.png
+++ b/examples/quick/controls/text/qml/images/textjustify.png
diff --git a/examples/text/qml/images/textleft.png b/examples/quick/controls/text/qml/images/textleft.png
index 83a66d55..83a66d55 100644
--- a/examples/text/qml/images/textleft.png
+++ b/examples/quick/controls/text/qml/images/textleft.png
diff --git a/examples/text/qml/images/textright.png b/examples/quick/controls/text/qml/images/textright.png
index e7c04645..e7c04645 100644
--- a/examples/text/qml/images/textright.png
+++ b/examples/quick/controls/text/qml/images/textright.png
diff --git a/examples/text/qml/images/textunder.png b/examples/quick/controls/text/qml/images/textunder.png
index 968bac5e..968bac5e 100644
--- a/examples/text/qml/images/textunder.png
+++ b/examples/quick/controls/text/qml/images/textunder.png
diff --git a/examples/text/qml/images/zoomin.png b/examples/quick/controls/text/qml/images/zoomin.png
index d46f5aff..d46f5aff 100644
--- a/examples/text/qml/images/zoomin.png
+++ b/examples/quick/controls/text/qml/images/zoomin.png
diff --git a/examples/text/qml/images/zoomout.png b/examples/quick/controls/text/qml/images/zoomout.png
index 46326566..46326566 100644
--- a/examples/text/qml/images/zoomout.png
+++ b/examples/quick/controls/text/qml/images/zoomout.png
diff --git a/examples/text/qml/main.qml b/examples/quick/controls/text/qml/main.qml
index dd8b1848..dd8b1848 100644
--- a/examples/text/qml/main.qml
+++ b/examples/quick/controls/text/qml/main.qml
diff --git a/examples/text/resources.qrc b/examples/quick/controls/text/resources.qrc
index e67fac6a..e67fac6a 100644
--- a/examples/text/resources.qrc
+++ b/examples/quick/controls/text/resources.qrc
diff --git a/examples/text/src/documenthandler.cpp b/examples/quick/controls/text/src/documenthandler.cpp
index 48b6d033..48b6d033 100644
--- a/examples/text/src/documenthandler.cpp
+++ b/examples/quick/controls/text/src/documenthandler.cpp
diff --git a/examples/text/src/documenthandler.h b/examples/quick/controls/text/src/documenthandler.h
index c60bc1d5..c60bc1d5 100644
--- a/examples/text/src/documenthandler.h
+++ b/examples/quick/controls/text/src/documenthandler.h
diff --git a/examples/text/src/main.cpp b/examples/quick/controls/text/src/main.cpp
index 0fc064dc..0fc064dc 100644
--- a/examples/text/src/main.cpp
+++ b/examples/quick/controls/text/src/main.cpp
diff --git a/examples/text/src/src.pri b/examples/quick/controls/text/src/src.pri
index 2b89cd62..2b89cd62 100644
--- a/examples/text/src/src.pri
+++ b/examples/quick/controls/text/src/src.pri
diff --git a/examples/text/text.pro b/examples/quick/controls/text/text.pro
index 3b5b1046..3b5b1046 100644
--- a/examples/text/text.pro
+++ b/examples/quick/controls/text/text.pro
diff --git a/examples/touch/content/AndroidDelegate.qml b/examples/quick/controls/touch/content/AndroidDelegate.qml
index 36a439a8..36a439a8 100644
--- a/examples/touch/content/AndroidDelegate.qml
+++ b/examples/quick/controls/touch/content/AndroidDelegate.qml
diff --git a/examples/touch/content/ButtonPage.qml b/examples/quick/controls/touch/content/ButtonPage.qml
index cc5925ce..cc5925ce 100644
--- a/examples/touch/content/ButtonPage.qml
+++ b/examples/quick/controls/touch/content/ButtonPage.qml
diff --git a/examples/touch/content/ProgressBarPage.qml b/examples/quick/controls/touch/content/ProgressBarPage.qml
index 86a46b69..86a46b69 100644
--- a/examples/touch/content/ProgressBarPage.qml
+++ b/examples/quick/controls/touch/content/ProgressBarPage.qml
diff --git a/examples/touch/content/SliderPage.qml b/examples/quick/controls/touch/content/SliderPage.qml
index 8d9ff0b1..8d9ff0b1 100644
--- a/examples/touch/content/SliderPage.qml
+++ b/examples/quick/controls/touch/content/SliderPage.qml
diff --git a/examples/touch/content/TabBarPage.qml b/examples/quick/controls/touch/content/TabBarPage.qml
index 41de7822..41de7822 100644
--- a/examples/touch/content/TabBarPage.qml
+++ b/examples/quick/controls/touch/content/TabBarPage.qml
diff --git a/examples/touch/content/TextInputPage.qml b/examples/quick/controls/touch/content/TextInputPage.qml
index 3f408d47..3f408d47 100644
--- a/examples/touch/content/TextInputPage.qml
+++ b/examples/quick/controls/touch/content/TextInputPage.qml
diff --git a/examples/touch/images/NOTICE.txt b/examples/quick/controls/touch/images/NOTICE.txt
index 93a9afc8..93a9afc8 100644
--- a/examples/touch/images/NOTICE.txt
+++ b/examples/quick/controls/touch/images/NOTICE.txt
diff --git a/examples/touch/images/button_default.png b/examples/quick/controls/touch/images/button_default.png
index 6d6cfd9a..6d6cfd9a 100644
--- a/examples/touch/images/button_default.png
+++ b/examples/quick/controls/touch/images/button_default.png
diff --git a/examples/touch/images/button_pressed.png b/examples/quick/controls/touch/images/button_pressed.png
index ab78b6ea..ab78b6ea 100644
--- a/examples/touch/images/button_pressed.png
+++ b/examples/quick/controls/touch/images/button_pressed.png
diff --git a/examples/touch/images/navigation_next_item.png b/examples/quick/controls/touch/images/navigation_next_item.png
index 6665c9d8..6665c9d8 100644
--- a/examples/touch/images/navigation_next_item.png
+++ b/examples/quick/controls/touch/images/navigation_next_item.png
diff --git a/examples/touch/images/navigation_previous_item.png b/examples/quick/controls/touch/images/navigation_previous_item.png
index f8be0119..f8be0119 100644
--- a/examples/touch/images/navigation_previous_item.png
+++ b/examples/quick/controls/touch/images/navigation_previous_item.png
diff --git a/examples/touch/images/tab_selected.png b/examples/quick/controls/touch/images/tab_selected.png
index 2345f7a8..2345f7a8 100644
--- a/examples/touch/images/tab_selected.png
+++ b/examples/quick/controls/touch/images/tab_selected.png
diff --git a/examples/touch/images/tabs_standard.png b/examples/quick/controls/touch/images/tabs_standard.png
index 7140ab7b..7140ab7b 100644
--- a/examples/touch/images/tabs_standard.png
+++ b/examples/quick/controls/touch/images/tabs_standard.png
diff --git a/examples/touch/images/textinput.png b/examples/quick/controls/touch/images/textinput.png
index b0256db2..b0256db2 100644
--- a/examples/touch/images/textinput.png
+++ b/examples/quick/controls/touch/images/textinput.png
diff --git a/examples/touch/images/toolbar.png b/examples/quick/controls/touch/images/toolbar.png
index e9eba4c7..e9eba4c7 100644
--- a/examples/touch/images/toolbar.png
+++ b/examples/quick/controls/touch/images/toolbar.png
diff --git a/examples/touch/main.qml b/examples/quick/controls/touch/main.qml
index 342d4f2d..342d4f2d 100644
--- a/examples/touch/main.qml
+++ b/examples/quick/controls/touch/main.qml
diff --git a/examples/touch/touch.pro b/examples/quick/controls/touch/touch.pro
index f81aa058..f81aa058 100644
--- a/examples/touch/touch.pro
+++ b/examples/quick/controls/touch/touch.pro
diff --git a/examples/touch/touch.qmlproject b/examples/quick/controls/touch/touch.qmlproject
index e5a8bf02..e5a8bf02 100644
--- a/examples/touch/touch.qmlproject
+++ b/examples/quick/controls/touch/touch.qmlproject
diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf
index bcb4cedf..cdf1701f 100644
--- a/src/controls/doc/qtquickcontrols.qdocconf
+++ b/src/controls/doc/qtquickcontrols.qdocconf
@@ -31,7 +31,7 @@ qhp.QtQuickControls.subprojects.styleqmltypes.sortPages = true
 
 depends = qtqml qtquick qtwidgets qtdoc qtquicklayouts
 
-exampledirs += ../../../examples/
+exampledirs += ../../../examples/quick/controls
 
 headerdirs += ../
 
diff --git a/src/layouts/doc/qtquicklayouts.qdocconf b/src/layouts/doc/qtquicklayouts.qdocconf
index c4c60336..ddacf9a6 100644
--- a/src/layouts/doc/qtquicklayouts.qdocconf
+++ b/src/layouts/doc/qtquicklayouts.qdocconf
@@ -26,7 +26,7 @@ qhp.qtquicklayouts.subprojects.qtquicklayoutsqmltypes.type = manual
 
 depends = qtqml qtquick qtwidgets qtdoc qtquicklayouts
 
-exampledirs += ../../../examples/
+exampledirs += ../../../examples/quick/controls/
 
 headerdirs += ../
 
diff --git a/tests/manual/scrollview/main.qml b/tests/manual/scrollview/main.qml
index cc7b967d..71accd8e 100644
--- a/tests/manual/scrollview/main.qml
+++ b/tests/manual/scrollview/main.qml
@@ -109,7 +109,7 @@ ApplicationWindow {
                     width: widthSpinBox.value
                     height: heightSpinBox.value
                     fillMode: Image.Tile
-                    source: "../../../examples/touch/images/button_pressed.png"
+                    source: "../../../examples/quick/controls/touch/images/button_pressed.png"
                 }
             }
         }
@@ -126,7 +126,7 @@ ApplicationWindow {
                         width: widthSpinBox.value
                         height: heightSpinBox.value
                         fillMode: Image.Tile
-                        source: "../../../examples/touch/images/button_pressed.png"
+                        source: "../../../examples/quick/controls/touch/images/button_pressed.png"
                     }
                 }
             }
diff --git a/tools/qmlwidget/main.cpp b/tools/qmlwidget/main.cpp
index 37752c4d..f71b76e4 100644
--- a/tools/qmlwidget/main.cpp
+++ b/tools/qmlwidget/main.cpp
@@ -54,7 +54,7 @@ int main(int argc, char ** argv)
 
     QQuickView quickView;
     quickView.setObjectName("quick view");
-    quickView.setSource(QUrl::fromLocalFile("../examples/Gallery.qml"));
+    quickView.setSource(QUrl::fromLocalFile("../examples/quick/controls/Gallery.qml"));
 
     QWindowWidget windowWidget;
     windowWidget.setObjectName("window widget");