Restructure tests in preparation for merging into qtdeclarative

Task-number: QTBUG-95173
Change-Id: I541dc26cf2cdd6f2640824f693f7d059445367d9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit f865f4b76d9385077c9ba4ca91a91246554dd36e)
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

215 files changed, 20 insertions, 19 deletions

diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index ca545da7e1..b0df947d89 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -1,18 +1 @@
-# Generated from manual.pro.
-
-add_subdirectory(buttons)
-add_subdirectory(dialogs)
-add_subdirectory(fonts)
-add_subdirectory(gifs)
-add_subdirectory(headerview)
-add_subdirectory(qquickdialog)
-add_subdirectory(screenshots)
-add_subdirectory(styles)
-add_subdirectory(styles-cover-flow)
-add_subdirectory(testbench)
-if(QT_FEATURE_systemtrayicon)
-    add_subdirectory(systemtrayicon)
-endif()
-if(TARGET Qt::Widgets)
-    add_subdirectory(viewinqwidget)
-endif()
+add_subdirectory(quickcontrols2)
diff --git a/tests/manual/quickcontrols2/CMakeLists.txt b/tests/manual/quickcontrols2/CMakeLists.txt
new file mode 100644
index 0000000000..4587ecf1cd
--- /dev/null
+++ b/tests/manual/quickcontrols2/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from manual.pro.
+
+add_subdirectory(buttons)
+add_subdirectory(dialogs)
+add_subdirectory(fonts)
+add_subdirectory(gifs)
+add_subdirectory(headerview)
+add_subdirectory(qquickdialog)
+add_subdirectory(screenshots)
+add_subdirectory(styles)
+add_subdirectory(styles-cover-flow)
+add_subdirectory(testbench)
+if(QT_FEATURE_systemtrayicon)
+    add_subdirectory(systemtrayicon)
+endif()
+if(TARGET Qt::Widgets AND TARGET Qt::QuickWidgets)
+    add_subdirectory(viewinqwidget)
+endif()
diff --git a/tests/manual/buttons/ButtonLoader.qml b/tests/manual/quickcontrols2/buttons/ButtonLoader.qml
index ecbf637b17..ecbf637b17 100644
--- a/tests/manual/buttons/ButtonLoader.qml
+++ b/tests/manual/quickcontrols2/buttons/ButtonLoader.qml
diff --git a/tests/manual/buttons/CMakeLists.txt b/tests/manual/quickcontrols2/buttons/CMakeLists.txt
index 57f80c88d9..57f80c88d9 100644
--- a/tests/manual/buttons/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/buttons/CMakeLists.txt
diff --git a/tests/manual/buttons/buttons.cpp b/tests/manual/quickcontrols2/buttons/buttons.cpp
index 0272522a50..0272522a50 100644
--- a/tests/manual/buttons/buttons.cpp
+++ b/tests/manual/quickcontrols2/buttons/buttons.cpp
diff --git a/tests/manual/buttons/buttons.pro b/tests/manual/quickcontrols2/buttons/buttons.pro
index 2cb1c14c54..2cb1c14c54 100644
--- a/tests/manual/buttons/buttons.pro
+++ b/tests/manual/quickcontrols2/buttons/buttons.pro
diff --git a/tests/manual/buttons/buttons.qml b/tests/manual/quickcontrols2/buttons/buttons.qml
index 26969440de..26969440de 100644
--- a/tests/manual/buttons/buttons.qml
+++ b/tests/manual/quickcontrols2/buttons/buttons.qml
diff --git a/tests/manual/dialogs/CMakeLists.txt b/tests/manual/quickcontrols2/dialogs/CMakeLists.txt
index cc132f36e4..cc132f36e4 100644
--- a/tests/manual/dialogs/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/dialogs/CMakeLists.txt
diff --git a/tests/manual/dialogs/FileDialogPage.qml b/tests/manual/quickcontrols2/dialogs/FileDialogPage.qml
index 9faad47e49..9faad47e49 100644
--- a/tests/manual/dialogs/FileDialogPage.qml
+++ b/tests/manual/quickcontrols2/dialogs/FileDialogPage.qml
diff --git a/tests/manual/dialogs/FontDialogPage.qml b/tests/manual/quickcontrols2/dialogs/FontDialogPage.qml
index 5b5d103445..5b5d103445 100644
--- a/tests/manual/dialogs/FontDialogPage.qml
+++ b/tests/manual/quickcontrols2/dialogs/FontDialogPage.qml
diff --git a/tests/manual/dialogs/StringListView.qml b/tests/manual/quickcontrols2/dialogs/StringListView.qml
index 4a229404fc..4a229404fc 100644
--- a/tests/manual/dialogs/StringListView.qml
+++ b/tests/manual/quickcontrols2/dialogs/StringListView.qml
diff --git a/tests/manual/dialogs/Theme.qml b/tests/manual/quickcontrols2/dialogs/Theme.qml
index 8114f14eb1..8114f14eb1 100644
--- a/tests/manual/dialogs/Theme.qml
+++ b/tests/manual/quickcontrols2/dialogs/Theme.qml
diff --git a/tests/manual/dialogs/dialogs.cpp b/tests/manual/quickcontrols2/dialogs/dialogs.cpp
index 8bab70e26d..8bab70e26d 100644
--- a/tests/manual/dialogs/dialogs.cpp
+++ b/tests/manual/quickcontrols2/dialogs/dialogs.cpp
diff --git a/tests/manual/dialogs/dialogs.pro b/tests/manual/quickcontrols2/dialogs/dialogs.pro
index 7dc1b8fd05..7dc1b8fd05 100644
--- a/tests/manual/dialogs/dialogs.pro
+++ b/tests/manual/quickcontrols2/dialogs/dialogs.pro
diff --git a/tests/manual/dialogs/dialogs.qml b/tests/manual/quickcontrols2/dialogs/dialogs.qml
index 6e64659e88..6e64659e88 100644
--- a/tests/manual/dialogs/dialogs.qml
+++ b/tests/manual/quickcontrols2/dialogs/dialogs.qml
diff --git a/tests/manual/dialogs/qmldir b/tests/manual/quickcontrols2/dialogs/qmldir
index 4f4a6b7bf9..4f4a6b7bf9 100644
--- a/tests/manual/dialogs/qmldir
+++ b/tests/manual/quickcontrols2/dialogs/qmldir
diff --git a/tests/manual/fonts/CMakeLists.txt b/tests/manual/quickcontrols2/fonts/CMakeLists.txt
index 6160ff1162..6160ff1162 100644
--- a/tests/manual/fonts/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/fonts/CMakeLists.txt
diff --git a/tests/manual/fonts/deployment.pri b/tests/manual/quickcontrols2/fonts/deployment.pri
index c89af25a85..c89af25a85 100644
--- a/tests/manual/fonts/deployment.pri
+++ b/tests/manual/quickcontrols2/fonts/deployment.pri
diff --git a/tests/manual/fonts/fonts.pro b/tests/manual/quickcontrols2/fonts/fonts.pro
index 36e70f7e18..36e70f7e18 100644
--- a/tests/manual/fonts/fonts.pro
+++ b/tests/manual/quickcontrols2/fonts/fonts.pro
diff --git a/tests/manual/fonts/main.cpp b/tests/manual/quickcontrols2/fonts/main.cpp
index 43e58bdd35..43e58bdd35 100644
--- a/tests/manual/fonts/main.cpp
+++ b/tests/manual/quickcontrols2/fonts/main.cpp
diff --git a/tests/manual/fonts/main.qml b/tests/manual/quickcontrols2/fonts/main.qml
index 8d3464a005..8d3464a005 100644
--- a/tests/manual/fonts/main.qml
+++ b/tests/manual/quickcontrols2/fonts/main.qml
diff --git a/tests/manual/fonts/qml.qrc b/tests/manual/quickcontrols2/fonts/qml.qrc
index 0ff3892d9c..0ff3892d9c 100644
--- a/tests/manual/fonts/qml.qrc
+++ b/tests/manual/quickcontrols2/fonts/qml.qrc
diff --git a/tests/manual/gifs/CMakeLists.txt b/tests/manual/quickcontrols2/gifs/CMakeLists.txt
index a2fc53554d..a2fc53554d 100644
--- a/tests/manual/gifs/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/gifs/CMakeLists.txt
diff --git a/tests/manual/gifs/capturedevent.cpp b/tests/manual/quickcontrols2/gifs/capturedevent.cpp
index cec5e97a6b..cec5e97a6b 100644
--- a/tests/manual/gifs/capturedevent.cpp
+++ b/tests/manual/quickcontrols2/gifs/capturedevent.cpp
diff --git a/tests/manual/gifs/capturedevent.h b/tests/manual/quickcontrols2/gifs/capturedevent.h
index 28ed510a8d..28ed510a8d 100644
--- a/tests/manual/gifs/capturedevent.h
+++ b/tests/manual/quickcontrols2/gifs/capturedevent.h
diff --git a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-busyindicator.qml
index 37dc5c7fd9..37dc5c7fd9 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-busyindicator.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-flat.qml
index dd07926ff1..dd07926ff1 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-flat.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-highlighted.qml
index 4af50d6b2c..4af50d6b2c 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-highlighted.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-button.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button.qml
index 8336855c46..8336855c46 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-button.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox-tristate.qml
index b0bee6cd54..b0bee6cd54 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox-tristate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox.qml
index 46cdc073aa..46cdc073aa 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml
index 585aea2704..585aea2704 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate.qml
index 704a060114..704a060114 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-combobox.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-combobox.qml
index 274f2efe61..274f2efe61 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-combobox.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-combobox.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-delaybutton.qml
index 8eaa3df24a..8eaa3df24a 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-delaybutton.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-no-wrap.qml
index 3b9b14668f..3b9b14668f 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-no-wrap.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-wrap.qml
index 317d81d27b..317d81d27b 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-wrap.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-drawer.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-drawer.qml
index 32efcba8c4..32efcba8c4 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-drawer.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-drawer.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-itemdelegate.qml
index 1ef9e2c0c6..1ef9e2c0c6 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-itemdelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-menu.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-menu.qml
index 80f2c86d51..80f2c86d51 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-menu.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-menu.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml
index 4679ea03c8..4679ea03c8 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar.qml
index 994af450b7..994af450b7 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiobutton.qml
index fec7ec9b01..fec7ec9b01 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiobutton.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiodelegate.qml
index a00f320927..a00f320927 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiodelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-rangeslider.qml
index c648f9983a..c648f9983a 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-rangeslider.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar-snap.qml
index cc4d6dc2fa..cc4d6dc2fa 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar-snap.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar.qml
index e838673a2a..e838673a2a 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollindicator.qml
index be23df3b25..be23df3b25 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollindicator.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider-snap.qml
index 26066770e7..26066770e7 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider-snap.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider.qml
index 83f652aa26..83f652aa26 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-slider.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-pop.qml
index 7ddd8db803..7ddd8db803 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-pop.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-push.qml
index 88229fce7e..88229fce7e 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-push.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-replace.qml
index 59885745c1..59885745c1 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-replace.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-unwind.qml
index a7435d2ac7..a7435d2ac7 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-unwind.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
index 0b18c6a336..0b18c6a336 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
index 789fb86f55..789fb86f55 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate.qml
index c78fc6d4f9..c78fc6d4f9 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipeview.qml
index 9004ff183b..9004ff183b 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipeview.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-switch.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switch.qml
index a9497bded5..a9497bded5 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-switch.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switch.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switchdelegate.qml
index 1caece5b16..1caece5b16 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switchdelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tabbar.qml
index a973cef8c4..a973cef8c4 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tabbar.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tumbler-wrap.qml
index bfad311e25..bfad311e25 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tumbler-wrap.qml
diff --git a/tests/manual/gifs/eventcapturer.cpp b/tests/manual/quickcontrols2/gifs/eventcapturer.cpp
index ad88b1dbf9..ad88b1dbf9 100644
--- a/tests/manual/gifs/eventcapturer.cpp
+++ b/tests/manual/quickcontrols2/gifs/eventcapturer.cpp
diff --git a/tests/manual/gifs/eventcapturer.h b/tests/manual/quickcontrols2/gifs/eventcapturer.h
index ea01299f54..ea01299f54 100644
--- a/tests/manual/gifs/eventcapturer.h
+++ b/tests/manual/quickcontrols2/gifs/eventcapturer.h
diff --git a/tests/manual/gifs/gifrecorder.cpp b/tests/manual/quickcontrols2/gifs/gifrecorder.cpp
index 4bc7c9cdf0..4bc7c9cdf0 100644
--- a/tests/manual/gifs/gifrecorder.cpp
+++ b/tests/manual/quickcontrols2/gifs/gifrecorder.cpp
diff --git a/tests/manual/gifs/gifrecorder.h b/tests/manual/quickcontrols2/gifs/gifrecorder.h
index 30d06b111a..30d06b111a 100644
--- a/tests/manual/gifs/gifrecorder.h
+++ b/tests/manual/quickcontrols2/gifs/gifrecorder.h
diff --git a/tests/manual/gifs/gifs.pro b/tests/manual/quickcontrols2/gifs/gifs.pro
index a5bb72c792..a5bb72c792 100644
--- a/tests/manual/gifs/gifs.pro
+++ b/tests/manual/quickcontrols2/gifs/gifs.pro
diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/quickcontrols2/gifs/tst_gifs.cpp
index 80c3fd9fef..80c3fd9fef 100644
--- a/tests/manual/gifs/tst_gifs.cpp
+++ b/tests/manual/quickcontrols2/gifs/tst_gifs.cpp
diff --git a/tests/manual/headerview/CMakeLists.txt b/tests/manual/quickcontrols2/headerview/CMakeLists.txt
index 4c4ae94a56..4c4ae94a56 100644
--- a/tests/manual/headerview/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/headerview/CMakeLists.txt
diff --git a/tests/manual/headerview/headerview.pro b/tests/manual/quickcontrols2/headerview/headerview.pro
index 474cc9214a..474cc9214a 100644
--- a/tests/manual/headerview/headerview.pro
+++ b/tests/manual/quickcontrols2/headerview/headerview.pro
diff --git a/tests/manual/headerview/main.cpp b/tests/manual/quickcontrols2/headerview/main.cpp
index a11f862704..a11f862704 100644
--- a/tests/manual/headerview/main.cpp
+++ b/tests/manual/quickcontrols2/headerview/main.cpp
diff --git a/tests/manual/headerview/main.qml b/tests/manual/quickcontrols2/headerview/main.qml
index abce1c00e0..abce1c00e0 100644
--- a/tests/manual/headerview/main.qml
+++ b/tests/manual/quickcontrols2/headerview/main.qml
diff --git a/tests/manual/manual.pro b/tests/manual/quickcontrols2/manual.pro
index 27ec27f18d..27ec27f18d 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/quickcontrols2/manual.pro
diff --git a/tests/manual/nativestyle/.gitignore b/tests/manual/quickcontrols2/nativestyle/.gitignore
index fab7372d79..fab7372d79 100644
--- a/tests/manual/nativestyle/.gitignore
+++ b/tests/manual/quickcontrols2/nativestyle/.gitignore
diff --git a/tests/manual/nativestyle/Buttons.qml b/tests/manual/quickcontrols2/nativestyle/Buttons.qml
index d5eb2a9cd3..d5eb2a9cd3 100644
--- a/tests/manual/nativestyle/Buttons.qml
+++ b/tests/manual/quickcontrols2/nativestyle/Buttons.qml
diff --git a/tests/manual/nativestyle/CMakeLists.txt b/tests/manual/quickcontrols2/nativestyle/CMakeLists.txt
index 269d2301bd..269d2301bd 100644
--- a/tests/manual/nativestyle/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/nativestyle/CMakeLists.txt
diff --git a/tests/manual/nativestyle/CheckBoxes.qml b/tests/manual/quickcontrols2/nativestyle/CheckBoxes.qml
index c24e9a54d9..c24e9a54d9 100644
--- a/tests/manual/nativestyle/CheckBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CheckBoxes.qml
diff --git a/tests/manual/nativestyle/ComboBoxes.qml b/tests/manual/quickcontrols2/nativestyle/ComboBoxes.qml
index 21dd5b091c..21dd5b091c 100644
--- a/tests/manual/nativestyle/ComboBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/ComboBoxes.qml
diff --git a/tests/manual/nativestyle/ControlContainer.qml b/tests/manual/quickcontrols2/nativestyle/ControlContainer.qml
index 5ac9f6bb18..5ac9f6bb18 100644
--- a/tests/manual/nativestyle/ControlContainer.qml
+++ b/tests/manual/quickcontrols2/nativestyle/ControlContainer.qml
diff --git a/tests/manual/nativestyle/CustomButtons.qml b/tests/manual/quickcontrols2/nativestyle/CustomButtons.qml
index 6a01faeda5..6a01faeda5 100644
--- a/tests/manual/nativestyle/CustomButtons.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomButtons.qml
diff --git a/tests/manual/nativestyle/CustomCheckBoxes.qml b/tests/manual/quickcontrols2/nativestyle/CustomCheckBoxes.qml
index 00dc7378f4..00dc7378f4 100644
--- a/tests/manual/nativestyle/CustomCheckBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomCheckBoxes.qml
diff --git a/tests/manual/nativestyle/CustomComboBoxes.qml b/tests/manual/quickcontrols2/nativestyle/CustomComboBoxes.qml
index a51cca9401..a51cca9401 100644
--- a/tests/manual/nativestyle/CustomComboBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomComboBoxes.qml
diff --git a/tests/manual/nativestyle/CustomDials.qml b/tests/manual/quickcontrols2/nativestyle/CustomDials.qml
index b0df77b603..b0df77b603 100644
--- a/tests/manual/nativestyle/CustomDials.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomDials.qml
diff --git a/tests/manual/nativestyle/CustomFrames.qml b/tests/manual/quickcontrols2/nativestyle/CustomFrames.qml
index e2b045a5cd..e2b045a5cd 100644
--- a/tests/manual/nativestyle/CustomFrames.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomFrames.qml
diff --git a/tests/manual/nativestyle/CustomProgressBars.qml b/tests/manual/quickcontrols2/nativestyle/CustomProgressBars.qml
index 6ace8f20bc..6ace8f20bc 100644
--- a/tests/manual/nativestyle/CustomProgressBars.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomProgressBars.qml
diff --git a/tests/manual/nativestyle/CustomRadioButtons.qml b/tests/manual/quickcontrols2/nativestyle/CustomRadioButtons.qml
index 8a657cdd5f..8a657cdd5f 100644
--- a/tests/manual/nativestyle/CustomRadioButtons.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomRadioButtons.qml
diff --git a/tests/manual/nativestyle/CustomScrollBars.qml b/tests/manual/quickcontrols2/nativestyle/CustomScrollBars.qml
index 0731995247..0731995247 100644
--- a/tests/manual/nativestyle/CustomScrollBars.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomScrollBars.qml
diff --git a/tests/manual/nativestyle/CustomSliders.qml b/tests/manual/quickcontrols2/nativestyle/CustomSliders.qml
index 075c10d326..075c10d326 100644
--- a/tests/manual/nativestyle/CustomSliders.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomSliders.qml
diff --git a/tests/manual/nativestyle/CustomSpinBoxes.qml b/tests/manual/quickcontrols2/nativestyle/CustomSpinBoxes.qml
index b6de2b57f7..b6de2b57f7 100644
--- a/tests/manual/nativestyle/CustomSpinBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomSpinBoxes.qml
diff --git a/tests/manual/nativestyle/CustomTextAreas.qml b/tests/manual/quickcontrols2/nativestyle/CustomTextAreas.qml
index 77e97b0cc0..77e97b0cc0 100644
--- a/tests/manual/nativestyle/CustomTextAreas.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomTextAreas.qml
diff --git a/tests/manual/nativestyle/CustomTextFields.qml b/tests/manual/quickcontrols2/nativestyle/CustomTextFields.qml
index 3e8ccd1e7b..3e8ccd1e7b 100644
--- a/tests/manual/nativestyle/CustomTextFields.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomTextFields.qml
diff --git a/tests/manual/nativestyle/Dials.qml b/tests/manual/quickcontrols2/nativestyle/Dials.qml
index f0655f25fb..f0655f25fb 100644
--- a/tests/manual/nativestyle/Dials.qml
+++ b/tests/manual/quickcontrols2/nativestyle/Dials.qml
diff --git a/tests/manual/nativestyle/Frames.qml b/tests/manual/quickcontrols2/nativestyle/Frames.qml
index 220f8d034e..220f8d034e 100644
--- a/tests/manual/nativestyle/Frames.qml
+++ b/tests/manual/quickcontrols2/nativestyle/Frames.qml
diff --git a/tests/manual/nativestyle/ProgressBars.qml b/tests/manual/quickcontrols2/nativestyle/ProgressBars.qml
index 8abd076d96..8abd076d96 100644
--- a/tests/manual/nativestyle/ProgressBars.qml
+++ b/tests/manual/quickcontrols2/nativestyle/ProgressBars.qml
diff --git a/tests/manual/nativestyle/RadioButtons.qml b/tests/manual/quickcontrols2/nativestyle/RadioButtons.qml
index 24a96b5910..24a96b5910 100644
--- a/tests/manual/nativestyle/RadioButtons.qml
+++ b/tests/manual/quickcontrols2/nativestyle/RadioButtons.qml
diff --git a/tests/manual/nativestyle/ScrollBars.qml b/tests/manual/quickcontrols2/nativestyle/ScrollBars.qml
index a5764c789f..a5764c789f 100644
--- a/tests/manual/nativestyle/ScrollBars.qml
+++ b/tests/manual/quickcontrols2/nativestyle/ScrollBars.qml
diff --git a/tests/manual/nativestyle/Sliders.qml b/tests/manual/quickcontrols2/nativestyle/Sliders.qml
index 81afa26c9f..81afa26c9f 100644
--- a/tests/manual/nativestyle/Sliders.qml
+++ b/tests/manual/quickcontrols2/nativestyle/Sliders.qml
diff --git a/tests/manual/nativestyle/SlidersMini.qml b/tests/manual/quickcontrols2/nativestyle/SlidersMini.qml
index 4c7610c497..4c7610c497 100644
--- a/tests/manual/nativestyle/SlidersMini.qml
+++ b/tests/manual/quickcontrols2/nativestyle/SlidersMini.qml
diff --git a/tests/manual/nativestyle/SlidersSmall.qml b/tests/manual/quickcontrols2/nativestyle/SlidersSmall.qml
index 04c9cb24e7..04c9cb24e7 100644
--- a/tests/manual/nativestyle/SlidersSmall.qml
+++ b/tests/manual/quickcontrols2/nativestyle/SlidersSmall.qml
diff --git a/tests/manual/nativestyle/SpinBoxes.qml b/tests/manual/quickcontrols2/nativestyle/SpinBoxes.qml
index 552f159bb9..552f159bb9 100644
--- a/tests/manual/nativestyle/SpinBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/SpinBoxes.qml
diff --git a/tests/manual/nativestyle/TextAreas.qml b/tests/manual/quickcontrols2/nativestyle/TextAreas.qml
index d8d49c021b..d8d49c021b 100644
--- a/tests/manual/nativestyle/TextAreas.qml
+++ b/tests/manual/quickcontrols2/nativestyle/TextAreas.qml
diff --git a/tests/manual/nativestyle/TextFields.qml b/tests/manual/quickcontrols2/nativestyle/TextFields.qml
index 10e97da5e8..10e97da5e8 100644
--- a/tests/manual/nativestyle/TextFields.qml
+++ b/tests/manual/quickcontrols2/nativestyle/TextFields.qml
diff --git a/tests/manual/nativestyle/checkbox-icon.png b/tests/manual/quickcontrols2/nativestyle/checkbox-icon.png
index ee669b3a88..ee669b3a88 100644
--- a/tests/manual/nativestyle/checkbox-icon.png
+++ b/tests/manual/quickcontrols2/nativestyle/checkbox-icon.png
diff --git a/tests/manual/nativestyle/checkbox-icon16.png b/tests/manual/quickcontrols2/nativestyle/checkbox-icon16.png
index 8d89eab841..8d89eab841 100644
--- a/tests/manual/nativestyle/checkbox-icon16.png
+++ b/tests/manual/quickcontrols2/nativestyle/checkbox-icon16.png
diff --git a/tests/manual/nativestyle/checkbox-icon@2x.png b/tests/manual/quickcontrols2/nativestyle/checkbox-icon@2x.png
index 51c5601de0..51c5601de0 100644
--- a/tests/manual/nativestyle/checkbox-icon@2x.png
+++ b/tests/manual/quickcontrols2/nativestyle/checkbox-icon@2x.png
diff --git a/tests/manual/nativestyle/main.cpp b/tests/manual/quickcontrols2/nativestyle/main.cpp
index cc48753154..cc48753154 100644
--- a/tests/manual/nativestyle/main.cpp
+++ b/tests/manual/quickcontrols2/nativestyle/main.cpp
diff --git a/tests/manual/nativestyle/main.qml b/tests/manual/quickcontrols2/nativestyle/main.qml
index 5e44118c64..5e44118c64 100644
--- a/tests/manual/nativestyle/main.qml
+++ b/tests/manual/quickcontrols2/nativestyle/main.qml
diff --git a/tests/manual/nativestyle/nativestyle.pro b/tests/manual/quickcontrols2/nativestyle/nativestyle.pro
index 9c700430fe..9c700430fe 100644
--- a/tests/manual/nativestyle/nativestyle.pro
+++ b/tests/manual/quickcontrols2/nativestyle/nativestyle.pro
diff --git a/tests/manual/nativestyle/qml.qrc b/tests/manual/quickcontrols2/nativestyle/qml.qrc
index fba642e53f..fba642e53f 100644
--- a/tests/manual/nativestyle/qml.qrc
+++ b/tests/manual/quickcontrols2/nativestyle/qml.qrc
diff --git a/tests/manual/qquickdialog/CMakeLists.txt b/tests/manual/quickcontrols2/qquickdialog/CMakeLists.txt
index 661a7dc76c..661a7dc76c 100644
--- a/tests/manual/qquickdialog/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/qquickdialog/CMakeLists.txt
diff --git a/tests/manual/qquickdialog/CustomDialog.qml b/tests/manual/quickcontrols2/qquickdialog/CustomDialog.qml
index fb191c9f4e..fb191c9f4e 100644
--- a/tests/manual/qquickdialog/CustomDialog.qml
+++ b/tests/manual/quickcontrols2/qquickdialog/CustomDialog.qml
diff --git a/tests/manual/qquickdialog/DialogLabel.qml b/tests/manual/quickcontrols2/qquickdialog/DialogLabel.qml
index 3a1533eb16..3a1533eb16 100644
--- a/tests/manual/qquickdialog/DialogLabel.qml
+++ b/tests/manual/quickcontrols2/qquickdialog/DialogLabel.qml
diff --git a/tests/manual/qquickdialog/Marker.qml b/tests/manual/quickcontrols2/qquickdialog/Marker.qml
index cd93d05570..cd93d05570 100644
--- a/tests/manual/qquickdialog/Marker.qml
+++ b/tests/manual/quickcontrols2/qquickdialog/Marker.qml
diff --git a/tests/manual/qquickdialog/qquickdialog.cpp b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.cpp
index 77863abe83..77863abe83 100644
--- a/tests/manual/qquickdialog/qquickdialog.cpp
+++ b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.cpp
diff --git a/tests/manual/qquickdialog/qquickdialog.pro b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.pro
index aee7655b65..aee7655b65 100644
--- a/tests/manual/qquickdialog/qquickdialog.pro
+++ b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.pro
diff --git a/tests/manual/qquickdialog/qquickdialog.qml b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.qml
index 41bf6ab7c3..41bf6ab7c3 100644
--- a/tests/manual/qquickdialog/qquickdialog.qml
+++ b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.qml
diff --git a/tests/manual/qquickdialog/qtquickcontrols2.conf b/tests/manual/quickcontrols2/qquickdialog/qtquickcontrols2.conf
index 53f380bfc9..53f380bfc9 100644
--- a/tests/manual/qquickdialog/qtquickcontrols2.conf
+++ b/tests/manual/quickcontrols2/qquickdialog/qtquickcontrols2.conf
diff --git a/tests/manual/screenshots/CMakeLists.txt b/tests/manual/quickcontrols2/screenshots/CMakeLists.txt
index b6bd292615..b6bd292615 100644
--- a/tests/manual/screenshots/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/screenshots/CMakeLists.txt
diff --git a/tests/manual/screenshots/qtquickcontrols2.conf b/tests/manual/quickcontrols2/screenshots/qtquickcontrols2.conf
index d2081db1d0..d2081db1d0 100644
--- a/tests/manual/screenshots/qtquickcontrols2.conf
+++ b/tests/manual/quickcontrols2/screenshots/qtquickcontrols2.conf
diff --git a/tests/manual/screenshots/screenshots.cpp b/tests/manual/quickcontrols2/screenshots/screenshots.cpp
index e4e1844d6f..e4e1844d6f 100644
--- a/tests/manual/screenshots/screenshots.cpp
+++ b/tests/manual/quickcontrols2/screenshots/screenshots.cpp
diff --git a/tests/manual/screenshots/screenshots.pro b/tests/manual/quickcontrols2/screenshots/screenshots.pro
index 5894888f13..5894888f13 100644
--- a/tests/manual/screenshots/screenshots.pro
+++ b/tests/manual/quickcontrols2/screenshots/screenshots.pro
diff --git a/tests/manual/screenshots/screenshots.qml b/tests/manual/quickcontrols2/screenshots/screenshots.qml
index 3496b32bd6..3496b32bd6 100644
--- a/tests/manual/screenshots/screenshots.qml
+++ b/tests/manual/quickcontrols2/screenshots/screenshots.qml
diff --git a/tests/manual/shared/FontAwesome.otf b/tests/manual/quickcontrols2/shared/FontAwesome.otf
index 681bdd4d4c..681bdd4d4c 100644
--- a/tests/manual/shared/FontAwesome.otf
+++ b/tests/manual/quickcontrols2/shared/FontAwesome.otf
diff --git a/tests/manual/shared/FontAwesome.qml b/tests/manual/quickcontrols2/shared/FontAwesome.qml
index d64176b4a4..d64176b4a4 100644
--- a/tests/manual/shared/FontAwesome.qml
+++ b/tests/manual/quickcontrols2/shared/FontAwesome.qml
diff --git a/tests/manual/shared/FontAwesomeIcon.qml b/tests/manual/quickcontrols2/shared/FontAwesomeIcon.qml
index 74e7c5da12..74e7c5da12 100644
--- a/tests/manual/shared/FontAwesomeIcon.qml
+++ b/tests/manual/quickcontrols2/shared/FontAwesomeIcon.qml
diff --git a/tests/manual/shared/qmldir b/tests/manual/quickcontrols2/shared/qmldir
index 3cb55667c7..3cb55667c7 100644
--- a/tests/manual/shared/qmldir
+++ b/tests/manual/quickcontrols2/shared/qmldir
diff --git a/tests/manual/shared/shared.qrc b/tests/manual/quickcontrols2/shared/shared.qrc
index 8dbb342156..8dbb342156 100644
--- a/tests/manual/shared/shared.qrc
+++ b/tests/manual/quickcontrols2/shared/shared.qrc
diff --git a/tests/manual/styles-cover-flow/CMakeLists.txt b/tests/manual/quickcontrols2/styles-cover-flow/CMakeLists.txt
index ab62046cd9..84d8460ad8 100644
--- a/tests/manual/styles-cover-flow/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/styles-cover-flow/CMakeLists.txt
@@ -15,7 +15,7 @@ qt_internal_add_manual_test(stylescoverflow
     SOURCES
         styles-cover-flow.cpp
     DEFINES
-        DOC_IMAGES_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports/controls/doc/images/\\\"
+        DOC_IMAGES_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/imports/controls/doc/images/\\\"
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Quick
diff --git a/tests/manual/styles-cover-flow/CoverFlowDelegate.qml b/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowDelegate.qml
index 061ecfa0a8..061ecfa0a8 100644
--- a/tests/manual/styles-cover-flow/CoverFlowDelegate.qml
+++ b/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowDelegate.qml
diff --git a/tests/manual/styles-cover-flow/CoverFlowPath.qml b/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowPath.qml
index 0f70e6b890..0f70e6b890 100644
--- a/tests/manual/styles-cover-flow/CoverFlowPath.qml
+++ b/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowPath.qml
diff --git a/tests/manual/styles-cover-flow/styles-cover-flow.cpp b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.cpp
index d665d6139b..d665d6139b 100644
--- a/tests/manual/styles-cover-flow/styles-cover-flow.cpp
+++ b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.cpp
diff --git a/tests/manual/styles-cover-flow/styles-cover-flow.pro b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.pro
index 2faa9fbabb..2faa9fbabb 100644
--- a/tests/manual/styles-cover-flow/styles-cover-flow.pro
+++ b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.pro
diff --git a/tests/manual/styles-cover-flow/styles-cover-flow.qml b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.qml
index 0f400c0d5e..0f400c0d5e 100644
--- a/tests/manual/styles-cover-flow/styles-cover-flow.qml
+++ b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.qml
diff --git a/tests/manual/styles/CMakeLists.txt b/tests/manual/quickcontrols2/styles/CMakeLists.txt
index 7ba6c733bb..7ba6c733bb 100644
--- a/tests/manual/styles/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/styles/CMakeLists.txt
diff --git a/tests/manual/styles/styles.cpp b/tests/manual/quickcontrols2/styles/styles.cpp
index a0f0de7b08..a0f0de7b08 100644
--- a/tests/manual/styles/styles.cpp
+++ b/tests/manual/quickcontrols2/styles/styles.cpp
diff --git a/tests/manual/styles/styles.pro b/tests/manual/quickcontrols2/styles/styles.pro
index 060ab4f7e8..060ab4f7e8 100644
--- a/tests/manual/styles/styles.pro
+++ b/tests/manual/quickcontrols2/styles/styles.pro
diff --git a/tests/manual/styles/styles.qml b/tests/manual/quickcontrols2/styles/styles.qml
index 83bd9b3441..83bd9b3441 100644
--- a/tests/manual/styles/styles.qml
+++ b/tests/manual/quickcontrols2/styles/styles.qml
diff --git a/tests/manual/systemtrayicon/CMakeLists.txt b/tests/manual/quickcontrols2/systemtrayicon/CMakeLists.txt
index b44a44967a..b44a44967a 100644
--- a/tests/manual/systemtrayicon/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/systemtrayicon/CMakeLists.txt
diff --git a/tests/manual/systemtrayicon/images/qt_logo_green_256.png b/tests/manual/quickcontrols2/systemtrayicon/images/qt_logo_green_256.png
index a7b16ba4f9..a7b16ba4f9 100644
--- a/tests/manual/systemtrayicon/images/qt_logo_green_256.png
+++ b/tests/manual/quickcontrols2/systemtrayicon/images/qt_logo_green_256.png
diff --git a/tests/manual/systemtrayicon/systemtrayicon.cpp b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.cpp
index 1866a269bf..1866a269bf 100644
--- a/tests/manual/systemtrayicon/systemtrayicon.cpp
+++ b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.cpp
diff --git a/tests/manual/systemtrayicon/systemtrayicon.pro b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.pro
index 24b9caa0cf..24b9caa0cf 100644
--- a/tests/manual/systemtrayicon/systemtrayicon.pro
+++ b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.pro
diff --git a/tests/manual/systemtrayicon/systemtrayicon.qml b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qml
index d44bc83b47..d44bc83b47 100644
--- a/tests/manual/systemtrayicon/systemtrayicon.qml
+++ b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qml
diff --git a/tests/manual/systemtrayicon/systemtrayicon.qrc b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qrc
index 656476d940..656476d940 100644
--- a/tests/manual/systemtrayicon/systemtrayicon.qrc
+++ b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qrc
diff --git a/tests/manual/testbench/+Imagine/ApplicationWindow.qml b/tests/manual/quickcontrols2/testbench/+Imagine/ApplicationWindow.qml
index a8e49b073c..a8e49b073c 100644
--- a/tests/manual/testbench/+Imagine/ApplicationWindow.qml
+++ b/tests/manual/quickcontrols2/testbench/+Imagine/ApplicationWindow.qml
diff --git a/tests/manual/testbench/+Imagine/ContentPane.qml b/tests/manual/quickcontrols2/testbench/+Imagine/ContentPane.qml
index 3e1cad864e..3e1cad864e 100644
--- a/tests/manual/testbench/+Imagine/ContentPane.qml
+++ b/tests/manual/quickcontrols2/testbench/+Imagine/ContentPane.qml
diff --git a/tests/manual/testbench/+Imagine/Dialog.qml b/tests/manual/quickcontrols2/testbench/+Imagine/Dialog.qml
index 7ea9619e95..7ea9619e95 100644
--- a/tests/manual/testbench/+Imagine/Dialog.qml
+++ b/tests/manual/quickcontrols2/testbench/+Imagine/Dialog.qml
diff --git a/tests/manual/testbench/+Imagine/Menu.qml b/tests/manual/quickcontrols2/testbench/+Imagine/Menu.qml
index 9587e0d4c0..9587e0d4c0 100644
--- a/tests/manual/testbench/+Imagine/Menu.qml
+++ b/tests/manual/quickcontrols2/testbench/+Imagine/Menu.qml
diff --git a/tests/manual/testbench/+Imagine/ToolBar.qml b/tests/manual/quickcontrols2/testbench/+Imagine/ToolBar.qml
index b1b32894a0..b1b32894a0 100644
--- a/tests/manual/testbench/+Imagine/ToolBar.qml
+++ b/tests/manual/quickcontrols2/testbench/+Imagine/ToolBar.qml
diff --git a/tests/manual/testbench/.gitignore b/tests/manual/quickcontrols2/testbench/.gitignore
index 75fae8bc39..75fae8bc39 100644
--- a/tests/manual/testbench/.gitignore
+++ b/tests/manual/quickcontrols2/testbench/.gitignore
diff --git a/tests/manual/testbench/ApplicationWindow.qml b/tests/manual/quickcontrols2/testbench/ApplicationWindow.qml
index 3c6785c913..3c6785c913 100644
--- a/tests/manual/testbench/ApplicationWindow.qml
+++ b/tests/manual/quickcontrols2/testbench/ApplicationWindow.qml
diff --git a/tests/manual/testbench/CMakeLists.txt b/tests/manual/quickcontrols2/testbench/CMakeLists.txt
index 66933a9225..66933a9225 100644
--- a/tests/manual/testbench/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/testbench/CMakeLists.txt
diff --git a/tests/manual/testbench/ColorEditor.qml b/tests/manual/quickcontrols2/testbench/ColorEditor.qml
index 2723f33dfc..2723f33dfc 100644
--- a/tests/manual/testbench/ColorEditor.qml
+++ b/tests/manual/quickcontrols2/testbench/ColorEditor.qml
diff --git a/tests/manual/testbench/ContentPane.qml b/tests/manual/quickcontrols2/testbench/ContentPane.qml
index 0a8c2f826c..0a8c2f826c 100644
--- a/tests/manual/testbench/ContentPane.qml
+++ b/tests/manual/quickcontrols2/testbench/ContentPane.qml
diff --git a/tests/manual/testbench/ControlContainer.qml b/tests/manual/quickcontrols2/testbench/ControlContainer.qml
index 4bd99bd304..4bd99bd304 100644
--- a/tests/manual/testbench/ControlContainer.qml
+++ b/tests/manual/quickcontrols2/testbench/ControlContainer.qml
diff --git a/tests/manual/testbench/Dialog.qml b/tests/manual/quickcontrols2/testbench/Dialog.qml
index 32c4806a5a..32c4806a5a 100644
--- a/tests/manual/testbench/Dialog.qml
+++ b/tests/manual/quickcontrols2/testbench/Dialog.qml
diff --git a/tests/manual/testbench/ExampleContainer.qml b/tests/manual/quickcontrols2/testbench/ExampleContainer.qml
index 903e52db3e..903e52db3e 100644
--- a/tests/manual/testbench/ExampleContainer.qml
+++ b/tests/manual/quickcontrols2/testbench/ExampleContainer.qml
diff --git a/tests/manual/testbench/Menu.qml b/tests/manual/quickcontrols2/testbench/Menu.qml
index 377cc3a057..377cc3a057 100644
--- a/tests/manual/testbench/Menu.qml
+++ b/tests/manual/quickcontrols2/testbench/Menu.qml
diff --git a/tests/manual/testbench/README.md b/tests/manual/quickcontrols2/testbench/README.md
index bd434de6a2..bd434de6a2 100644
--- a/tests/manual/testbench/README.md
+++ b/tests/manual/quickcontrols2/testbench/README.md
diff --git a/tests/manual/testbench/SettingsDialog.qml b/tests/manual/quickcontrols2/testbench/SettingsDialog.qml
index d11b5bea3e..d11b5bea3e 100644
--- a/tests/manual/testbench/SettingsDialog.qml
+++ b/tests/manual/quickcontrols2/testbench/SettingsDialog.qml
diff --git a/tests/manual/testbench/ToolBar.qml b/tests/manual/quickcontrols2/testbench/ToolBar.qml
index 90cbc1951f..90cbc1951f 100644
--- a/tests/manual/testbench/ToolBar.qml
+++ b/tests/manual/quickcontrols2/testbench/ToolBar.qml
diff --git a/tests/manual/testbench/assetfixer.cpp b/tests/manual/quickcontrols2/testbench/assetfixer.cpp
index 4813dac50d..4813dac50d 100644
--- a/tests/manual/testbench/assetfixer.cpp
+++ b/tests/manual/quickcontrols2/testbench/assetfixer.cpp
diff --git a/tests/manual/testbench/assetfixer.h b/tests/manual/quickcontrols2/testbench/assetfixer.h
index 4af9ccf4af..4af9ccf4af 100644
--- a/tests/manual/testbench/assetfixer.h
+++ b/tests/manual/quickcontrols2/testbench/assetfixer.h
diff --git a/tests/manual/testbench/clipboard.cpp b/tests/manual/quickcontrols2/testbench/clipboard.cpp
index 1daebfc92f..1daebfc92f 100644
--- a/tests/manual/testbench/clipboard.cpp
+++ b/tests/manual/quickcontrols2/testbench/clipboard.cpp
diff --git a/tests/manual/testbench/clipboard.h b/tests/manual/quickcontrols2/testbench/clipboard.h
index a21dd9c619..a21dd9c619 100644
--- a/tests/manual/testbench/clipboard.h
+++ b/tests/manual/quickcontrols2/testbench/clipboard.h
diff --git a/tests/manual/testbench/controls/BusyIndicator.qml b/tests/manual/quickcontrols2/testbench/controls/BusyIndicator.qml
index cc0f4518a4..cc0f4518a4 100644
--- a/tests/manual/testbench/controls/BusyIndicator.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/BusyIndicator.qml
diff --git a/tests/manual/testbench/controls/Button.qml b/tests/manual/quickcontrols2/testbench/controls/Button.qml
index ac57453fed..ac57453fed 100644
--- a/tests/manual/testbench/controls/Button.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Button.qml
diff --git a/tests/manual/testbench/controls/CheckBox.qml b/tests/manual/quickcontrols2/testbench/controls/CheckBox.qml
index 0598dae833..0598dae833 100644
--- a/tests/manual/testbench/controls/CheckBox.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/CheckBox.qml
diff --git a/tests/manual/testbench/controls/CheckDelegate.qml b/tests/manual/quickcontrols2/testbench/controls/CheckDelegate.qml
index 8f546384ff..8f546384ff 100644
--- a/tests/manual/testbench/controls/CheckDelegate.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/CheckDelegate.qml
diff --git a/tests/manual/testbench/controls/ComboBox.qml b/tests/manual/quickcontrols2/testbench/controls/ComboBox.qml
index 75fb7701b2..75fb7701b2 100644
--- a/tests/manual/testbench/controls/ComboBox.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ComboBox.qml
diff --git a/tests/manual/testbench/controls/DelayButton.qml b/tests/manual/quickcontrols2/testbench/controls/DelayButton.qml
index c0f6faa29b..c0f6faa29b 100644
--- a/tests/manual/testbench/controls/DelayButton.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/DelayButton.qml
diff --git a/tests/manual/testbench/controls/Dial.qml b/tests/manual/quickcontrols2/testbench/controls/Dial.qml
index 16c99ec833..16c99ec833 100644
--- a/tests/manual/testbench/controls/Dial.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Dial.qml
diff --git a/tests/manual/testbench/controls/Dialog.qml b/tests/manual/quickcontrols2/testbench/controls/Dialog.qml
index 0ea9d3be79..0ea9d3be79 100644
--- a/tests/manual/testbench/controls/Dialog.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Dialog.qml
diff --git a/tests/manual/testbench/controls/Frame.qml b/tests/manual/quickcontrols2/testbench/controls/Frame.qml
index dd88c3b8f3..dd88c3b8f3 100644
--- a/tests/manual/testbench/controls/Frame.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Frame.qml
diff --git a/tests/manual/testbench/controls/GroupBox.qml b/tests/manual/quickcontrols2/testbench/controls/GroupBox.qml
index 80ced76926..80ced76926 100644
--- a/tests/manual/testbench/controls/GroupBox.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/GroupBox.qml
diff --git a/tests/manual/testbench/controls/ItemDelegate.qml b/tests/manual/quickcontrols2/testbench/controls/ItemDelegate.qml
index 0b887e2f96..0b887e2f96 100644
--- a/tests/manual/testbench/controls/ItemDelegate.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ItemDelegate.qml
diff --git a/tests/manual/testbench/controls/Label.qml b/tests/manual/quickcontrols2/testbench/controls/Label.qml
index d8155a2016..d8155a2016 100644
--- a/tests/manual/testbench/controls/Label.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Label.qml
diff --git a/tests/manual/testbench/controls/Menu.qml b/tests/manual/quickcontrols2/testbench/controls/Menu.qml
index ba15c052d3..ba15c052d3 100644
--- a/tests/manual/testbench/controls/Menu.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Menu.qml
diff --git a/tests/manual/testbench/controls/MenuBar.qml b/tests/manual/quickcontrols2/testbench/controls/MenuBar.qml
index f435c9a5ae..f435c9a5ae 100644
--- a/tests/manual/testbench/controls/MenuBar.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/MenuBar.qml
diff --git a/tests/manual/testbench/controls/Page.qml b/tests/manual/quickcontrols2/testbench/controls/Page.qml
index 3d310676c3..3d310676c3 100644
--- a/tests/manual/testbench/controls/Page.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Page.qml
diff --git a/tests/manual/testbench/controls/PageIndicator.qml b/tests/manual/quickcontrols2/testbench/controls/PageIndicator.qml
index 5de29ef10b..5de29ef10b 100644
--- a/tests/manual/testbench/controls/PageIndicator.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/PageIndicator.qml
diff --git a/tests/manual/testbench/controls/Pane.qml b/tests/manual/quickcontrols2/testbench/controls/Pane.qml
index b5329b71da..b5329b71da 100644
--- a/tests/manual/testbench/controls/Pane.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Pane.qml
diff --git a/tests/manual/testbench/controls/ProgressBar.qml b/tests/manual/quickcontrols2/testbench/controls/ProgressBar.qml
index bc2d904589..bc2d904589 100644
--- a/tests/manual/testbench/controls/ProgressBar.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ProgressBar.qml
diff --git a/tests/manual/testbench/controls/RadioButton.qml b/tests/manual/quickcontrols2/testbench/controls/RadioButton.qml
index 7ca9bd0a8b..7ca9bd0a8b 100644
--- a/tests/manual/testbench/controls/RadioButton.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/RadioButton.qml
diff --git a/tests/manual/testbench/controls/RadioDelegate.qml b/tests/manual/quickcontrols2/testbench/controls/RadioDelegate.qml
index ddafd14c69..ddafd14c69 100644
--- a/tests/manual/testbench/controls/RadioDelegate.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/RadioDelegate.qml
diff --git a/tests/manual/testbench/controls/RangeSlider.qml b/tests/manual/quickcontrols2/testbench/controls/RangeSlider.qml
index 71208fb822..71208fb822 100644
--- a/tests/manual/testbench/controls/RangeSlider.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/RangeSlider.qml
diff --git a/tests/manual/testbench/controls/RoundButton.qml b/tests/manual/quickcontrols2/testbench/controls/RoundButton.qml
index fb2d1d4396..fb2d1d4396 100644
--- a/tests/manual/testbench/controls/RoundButton.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/RoundButton.qml
diff --git a/tests/manual/testbench/controls/ScrollBar.qml b/tests/manual/quickcontrols2/testbench/controls/ScrollBar.qml
index 4ed80f750e..4ed80f750e 100644
--- a/tests/manual/testbench/controls/ScrollBar.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ScrollBar.qml
diff --git a/tests/manual/testbench/controls/ScrollIndicator.qml b/tests/manual/quickcontrols2/testbench/controls/ScrollIndicator.qml
index d9ee487d08..d9ee487d08 100644
--- a/tests/manual/testbench/controls/ScrollIndicator.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ScrollIndicator.qml
diff --git a/tests/manual/testbench/controls/Slider.qml b/tests/manual/quickcontrols2/testbench/controls/Slider.qml
index 21e751acd7..21e751acd7 100644
--- a/tests/manual/testbench/controls/Slider.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Slider.qml
diff --git a/tests/manual/testbench/controls/SpinBox.qml b/tests/manual/quickcontrols2/testbench/controls/SpinBox.qml
index 22ca6ccefc..22ca6ccefc 100644
--- a/tests/manual/testbench/controls/SpinBox.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/SpinBox.qml
diff --git a/tests/manual/testbench/controls/SplitView.qml b/tests/manual/quickcontrols2/testbench/controls/SplitView.qml
index f2801def8f..f2801def8f 100644
--- a/tests/manual/testbench/controls/SplitView.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/SplitView.qml
diff --git a/tests/manual/testbench/controls/SwipeDelegate.qml b/tests/manual/quickcontrols2/testbench/controls/SwipeDelegate.qml
index 13d0a4437c..13d0a4437c 100644
--- a/tests/manual/testbench/controls/SwipeDelegate.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/SwipeDelegate.qml
diff --git a/tests/manual/testbench/controls/Switch.qml b/tests/manual/quickcontrols2/testbench/controls/Switch.qml
index 6e877a4995..6e877a4995 100644
--- a/tests/manual/testbench/controls/Switch.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Switch.qml
diff --git a/tests/manual/testbench/controls/SwitchDelegate.qml b/tests/manual/quickcontrols2/testbench/controls/SwitchDelegate.qml
index 4f60da5537..4f60da5537 100644
--- a/tests/manual/testbench/controls/SwitchDelegate.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/SwitchDelegate.qml
diff --git a/tests/manual/testbench/controls/TabBar.qml b/tests/manual/quickcontrols2/testbench/controls/TabBar.qml
index a7a1de490a..a7a1de490a 100644
--- a/tests/manual/testbench/controls/TabBar.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/TabBar.qml
diff --git a/tests/manual/testbench/controls/TextArea.qml b/tests/manual/quickcontrols2/testbench/controls/TextArea.qml
index dfe28f79f4..dfe28f79f4 100644
--- a/tests/manual/testbench/controls/TextArea.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/TextArea.qml
diff --git a/tests/manual/testbench/controls/TextField.qml b/tests/manual/quickcontrols2/testbench/controls/TextField.qml
index 1eed3a6c4a..1eed3a6c4a 100644
--- a/tests/manual/testbench/controls/TextField.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/TextField.qml
diff --git a/tests/manual/testbench/controls/ToolBar.qml b/tests/manual/quickcontrols2/testbench/controls/ToolBar.qml
index 3aba337782..3aba337782 100644
--- a/tests/manual/testbench/controls/ToolBar.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ToolBar.qml
diff --git a/tests/manual/testbench/controls/ToolTip.qml b/tests/manual/quickcontrols2/testbench/controls/ToolTip.qml
index ddcf92f860..ddcf92f860 100644
--- a/tests/manual/testbench/controls/ToolTip.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ToolTip.qml
diff --git a/tests/manual/testbench/controls/Tumbler.qml b/tests/manual/quickcontrols2/testbench/controls/Tumbler.qml
index a2dbebef27..a2dbebef27 100644
--- a/tests/manual/testbench/controls/Tumbler.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Tumbler.qml
diff --git a/tests/manual/testbench/deployment.pri b/tests/manual/quickcontrols2/testbench/deployment.pri
index c89af25a85..c89af25a85 100644
--- a/tests/manual/testbench/deployment.pri
+++ b/tests/manual/quickcontrols2/testbench/deployment.pri
diff --git a/tests/manual/testbench/directoryvalidator.cpp b/tests/manual/quickcontrols2/testbench/directoryvalidator.cpp
index d0d4cd8d57..d0d4cd8d57 100644
--- a/tests/manual/testbench/directoryvalidator.cpp
+++ b/tests/manual/quickcontrols2/testbench/directoryvalidator.cpp
diff --git a/tests/manual/testbench/directoryvalidator.h b/tests/manual/quickcontrols2/testbench/directoryvalidator.h
index a1650d863f..a1650d863f 100644
--- a/tests/manual/testbench/directoryvalidator.h
+++ b/tests/manual/quickcontrols2/testbench/directoryvalidator.h
diff --git a/tests/manual/testbench/fonts.qrc b/tests/manual/quickcontrols2/testbench/fonts.qrc
index fc86e03183..fc86e03183 100644
--- a/tests/manual/testbench/fonts.qrc
+++ b/tests/manual/quickcontrols2/testbench/fonts.qrc
diff --git a/tests/manual/testbench/fonts/LICENSE.txt b/tests/manual/quickcontrols2/testbench/fonts/LICENSE.txt
index 8fa3da363e..8fa3da363e 100644
--- a/tests/manual/testbench/fonts/LICENSE.txt
+++ b/tests/manual/quickcontrols2/testbench/fonts/LICENSE.txt
diff --git a/tests/manual/testbench/fonts/fontawesome.ttf b/tests/manual/quickcontrols2/testbench/fonts/fontawesome.ttf
index 49b6c5da65..49b6c5da65 100644
--- a/tests/manual/testbench/fonts/fontawesome.ttf
+++ b/tests/manual/quickcontrols2/testbench/fonts/fontawesome.ttf
diff --git a/tests/manual/testbench/main.cpp b/tests/manual/quickcontrols2/testbench/main.cpp
index ddad828f30..ddad828f30 100644
--- a/tests/manual/testbench/main.cpp
+++ b/tests/manual/quickcontrols2/testbench/main.cpp
diff --git a/tests/manual/testbench/qml.qrc b/tests/manual/quickcontrols2/testbench/qml.qrc
index 82e69be6f3..82e69be6f3 100644
--- a/tests/manual/testbench/qml.qrc
+++ b/tests/manual/quickcontrols2/testbench/qml.qrc
diff --git a/tests/manual/testbench/testbench.pro b/tests/manual/quickcontrols2/testbench/testbench.pro
index 4509f4967d..4509f4967d 100644
--- a/tests/manual/testbench/testbench.pro
+++ b/tests/manual/quickcontrols2/testbench/testbench.pro
diff --git a/tests/manual/testbench/testbench.qml b/tests/manual/quickcontrols2/testbench/testbench.qml
index 8f0951adae..8f0951adae 100644
--- a/tests/manual/testbench/testbench.qml
+++ b/tests/manual/quickcontrols2/testbench/testbench.qml
diff --git a/tests/manual/viewinqwidget/CMakeLists.txt b/tests/manual/quickcontrols2/viewinqwidget/CMakeLists.txt
index f91b0d8c02..f91b0d8c02 100644
--- a/tests/manual/viewinqwidget/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/viewinqwidget/CMakeLists.txt
diff --git a/tests/manual/viewinqwidget/main.cpp b/tests/manual/quickcontrols2/viewinqwidget/main.cpp
index b6b7a5ff02..b6b7a5ff02 100644
--- a/tests/manual/viewinqwidget/main.cpp
+++ b/tests/manual/quickcontrols2/viewinqwidget/main.cpp
diff --git a/tests/manual/viewinqwidget/main.qml b/tests/manual/quickcontrols2/viewinqwidget/main.qml
index 5ac170b320..5ac170b320 100644
--- a/tests/manual/viewinqwidget/main.qml
+++ b/tests/manual/quickcontrols2/viewinqwidget/main.qml
diff --git a/tests/manual/viewinqwidget/viewinqwidget.pro b/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.pro
index 649829d449..649829d449 100644
--- a/tests/manual/viewinqwidget/viewinqwidget.pro
+++ b/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.pro
diff --git a/tests/manual/viewinqwidget/viewinqwidget.qrc b/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.qrc
index 5f6483ac33..5f6483ac33 100644
--- a/tests/manual/viewinqwidget/viewinqwidget.qrc
+++ b/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.qrc