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>

1059 files changed, 105 insertions, 103 deletions

diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 6f230011..b0df947d 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,37 +1 @@
-# Generated from auto.pro.
-
-add_subdirectory(accessibility)
-add_subdirectory(controls)
-add_subdirectory(cursor)
-add_subdirectory(customization)
-add_subdirectory(designer)
-add_subdirectory(dialogs)
-add_subdirectory(focus)
-add_subdirectory(font)
-add_subdirectory(palette)
-add_subdirectory(platform)
-add_subdirectory(pressandhold)
-add_subdirectory(qquickapplicationwindow)
-add_subdirectory(qquickcontrol)
-add_subdirectory(qquickcolor)
-add_subdirectory(qquickdrawer)
-add_subdirectory(qquickheaderview)
-add_subdirectory(qquickiconimage)
-add_subdirectory(qquickiconlabel)
-add_subdirectory(qquickimaginestyle)
-add_subdirectory(qquickmaterialstyle)
-add_subdirectory(qquickmaterialstyleconf)
-add_subdirectory(qquickmenu)
-add_subdirectory(qquickmenubar)
-add_subdirectory(qquickninepatchimage)
-add_subdirectory(qquickpopup)
-add_subdirectory(qquickstyle)
-add_subdirectory(qquickuniversalstyle)
-add_subdirectory(qquickuniversalstyleconf)
-add_subdirectory(revisions)
-add_subdirectory(sanity)
-add_subdirectory(snippets)
-add_subdirectory(styleimports)
-add_subdirectory(styleimportscompiletimematerial)
-add_subdirectory(styleimportscompiletimeqmlonly)
-add_subdirectory(translation)
+add_subdirectory(quickcontrols2)
diff --git a/tests/auto/quickcontrols2/CMakeLists.txt b/tests/auto/quickcontrols2/CMakeLists.txt
new file mode 100644
index 00000000..ef299bb7
--- /dev/null
+++ b/tests/auto/quickcontrols2/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from auto.pro.
+
+add_subdirectory(accessibility)
+add_subdirectory(controls)
+add_subdirectory(cursor)
+add_subdirectory(customization)
+add_subdirectory(designer)
+add_subdirectory(dialogs)
+add_subdirectory(focus)
+add_subdirectory(font)
+add_subdirectory(palette)
+add_subdirectory(platform)
+add_subdirectory(pressandhold)
+add_subdirectory(qquickapplicationwindow)
+add_subdirectory(qquickcolor)
+add_subdirectory(qquickdrawer)
+add_subdirectory(qquickheaderview)
+add_subdirectory(qquickiconimage)
+add_subdirectory(qquickiconlabel)
+add_subdirectory(qquickimaginestyle)
+add_subdirectory(qquickmaterialstyle)
+add_subdirectory(qquickmaterialstyleconf)
+add_subdirectory(qquickmenu)
+add_subdirectory(qquickmenubar)
+add_subdirectory(qquickninepatchimage)
+add_subdirectory(qquickpopup)
+add_subdirectory(qquickstyle)
+add_subdirectory(qquickuniversalstyle)
+add_subdirectory(qquickuniversalstyleconf)
+add_subdirectory(revisions)
+add_subdirectory(sanity)
+add_subdirectory(snippets)
+add_subdirectory(styleimports)
+add_subdirectory(styleimportscompiletimematerial)
+add_subdirectory(styleimportscompiletimeqmlonly)
+add_subdirectory(translation)
diff --git a/tests/auto/accessibility/BLACKLIST b/tests/auto/quickcontrols2/accessibility/BLACKLIST
index fe7a87f8..fe7a87f8 100644
--- a/tests/auto/accessibility/BLACKLIST
+++ b/tests/auto/quickcontrols2/accessibility/BLACKLIST
diff --git a/tests/auto/accessibility/CMakeLists.txt b/tests/auto/quickcontrols2/accessibility/CMakeLists.txt
index 596bf3b9..ba27a497 100644
--- a/tests/auto/accessibility/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/accessibility/CMakeLists.txt
@@ -21,7 +21,7 @@ qt_internal_add_test(tst_accessibility
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_accessibility.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/accessibility/data/defaults/abstractbutton.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/abstractbutton.qml
index 29d6b3c0..29d6b3c0 100644
--- a/tests/auto/accessibility/data/defaults/abstractbutton.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/abstractbutton.qml
diff --git a/tests/auto/accessibility/data/defaults/busyindicator.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/busyindicator.qml
index baaa9ba8..baaa9ba8 100644
--- a/tests/auto/accessibility/data/defaults/busyindicator.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/busyindicator.qml
diff --git a/tests/auto/accessibility/data/defaults/button.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/button.qml
index 0359b3ac..0359b3ac 100644
--- a/tests/auto/accessibility/data/defaults/button.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/button.qml
diff --git a/tests/auto/accessibility/data/defaults/checkbox.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/checkbox.qml
index c912be57..c912be57 100644
--- a/tests/auto/accessibility/data/defaults/checkbox.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/checkbox.qml
diff --git a/tests/auto/accessibility/data/defaults/checkdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/checkdelegate.qml
index df62bc89..df62bc89 100644
--- a/tests/auto/accessibility/data/defaults/checkdelegate.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/checkdelegate.qml
diff --git a/tests/auto/accessibility/data/defaults/combobox.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/combobox.qml
index bfeac723..bfeac723 100644
--- a/tests/auto/accessibility/data/defaults/combobox.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/combobox.qml
diff --git a/tests/auto/accessibility/data/defaults/container.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/container.qml
index 7d29fec4..7d29fec4 100644
--- a/tests/auto/accessibility/data/defaults/container.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/container.qml
diff --git a/tests/auto/accessibility/data/defaults/control.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/control.qml
index 280cfd29..280cfd29 100644
--- a/tests/auto/accessibility/data/defaults/control.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/control.qml
diff --git a/tests/auto/accessibility/data/defaults/dial.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/dial.qml
index d7e700b5..d7e700b5 100644
--- a/tests/auto/accessibility/data/defaults/dial.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/dial.qml
diff --git a/tests/auto/accessibility/data/defaults/dialog.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/dialog.qml
index d88fd36d..d88fd36d 100644
--- a/tests/auto/accessibility/data/defaults/dialog.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/dialog.qml
diff --git a/tests/auto/accessibility/data/defaults/drawer.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/drawer.qml
index 60a35171..60a35171 100644
--- a/tests/auto/accessibility/data/defaults/drawer.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/drawer.qml
diff --git a/tests/auto/accessibility/data/defaults/frame.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/frame.qml
index b70ccb55..b70ccb55 100644
--- a/tests/auto/accessibility/data/defaults/frame.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/frame.qml
diff --git a/tests/auto/accessibility/data/defaults/groupbox.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/groupbox.qml
index 24f3a294..24f3a294 100644
--- a/tests/auto/accessibility/data/defaults/groupbox.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/groupbox.qml
diff --git a/tests/auto/accessibility/data/defaults/itemdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/itemdelegate.qml
index 5ec95fe0..5ec95fe0 100644
--- a/tests/auto/accessibility/data/defaults/itemdelegate.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/itemdelegate.qml
diff --git a/tests/auto/accessibility/data/defaults/label.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/label.qml
index 5f6a98cd..5f6a98cd 100644
--- a/tests/auto/accessibility/data/defaults/label.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/label.qml
diff --git a/tests/auto/accessibility/data/defaults/menu.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/menu.qml
index 07fef728..07fef728 100644
--- a/tests/auto/accessibility/data/defaults/menu.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/menu.qml
diff --git a/tests/auto/accessibility/data/defaults/menuitem.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/menuitem.qml
index 194fa988..194fa988 100644
--- a/tests/auto/accessibility/data/defaults/menuitem.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/menuitem.qml
diff --git a/tests/auto/accessibility/data/defaults/page.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/page.qml
index cd1f78e1..cd1f78e1 100644
--- a/tests/auto/accessibility/data/defaults/page.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/page.qml
diff --git a/tests/auto/accessibility/data/defaults/pageindicator.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/pageindicator.qml
index d64d5657..d64d5657 100644
--- a/tests/auto/accessibility/data/defaults/pageindicator.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/pageindicator.qml
diff --git a/tests/auto/accessibility/data/defaults/pane.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/pane.qml
index 765c98a3..765c98a3 100644
--- a/tests/auto/accessibility/data/defaults/pane.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/pane.qml
diff --git a/tests/auto/accessibility/data/defaults/popup.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/popup.qml
index c599bd4c..c599bd4c 100644
--- a/tests/auto/accessibility/data/defaults/popup.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/popup.qml
diff --git a/tests/auto/accessibility/data/defaults/progressbar.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/progressbar.qml
index b3e287c3..b3e287c3 100644
--- a/tests/auto/accessibility/data/defaults/progressbar.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/progressbar.qml
diff --git a/tests/auto/accessibility/data/defaults/radiobutton.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/radiobutton.qml
index d796b37e..d796b37e 100644
--- a/tests/auto/accessibility/data/defaults/radiobutton.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/radiobutton.qml
diff --git a/tests/auto/accessibility/data/defaults/radiodelegate.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/radiodelegate.qml
index d002b985..d002b985 100644
--- a/tests/auto/accessibility/data/defaults/radiodelegate.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/radiodelegate.qml
diff --git a/tests/auto/accessibility/data/defaults/rangeslider.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/rangeslider.qml
index 7bd364c4..7bd364c4 100644
--- a/tests/auto/accessibility/data/defaults/rangeslider.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/rangeslider.qml
diff --git a/tests/auto/accessibility/data/defaults/roundbutton.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/roundbutton.qml
index 6c78c0a4..6c78c0a4 100644
--- a/tests/auto/accessibility/data/defaults/roundbutton.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/roundbutton.qml
diff --git a/tests/auto/accessibility/data/defaults/scrollbar.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/scrollbar.qml
index c36b1534..c36b1534 100644
--- a/tests/auto/accessibility/data/defaults/scrollbar.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/scrollbar.qml
diff --git a/tests/auto/accessibility/data/defaults/scrollindicator.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/scrollindicator.qml
index 5b2f44b6..5b2f44b6 100644
--- a/tests/auto/accessibility/data/defaults/scrollindicator.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/scrollindicator.qml
diff --git a/tests/auto/accessibility/data/defaults/slider.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/slider.qml
index fd60a198..fd60a198 100644
--- a/tests/auto/accessibility/data/defaults/slider.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/slider.qml
diff --git a/tests/auto/accessibility/data/defaults/spinbox.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/spinbox.qml
index 159e1f46..159e1f46 100644
--- a/tests/auto/accessibility/data/defaults/spinbox.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/spinbox.qml
diff --git a/tests/auto/accessibility/data/defaults/stackview.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/stackview.qml
index bd540b91..bd540b91 100644
--- a/tests/auto/accessibility/data/defaults/stackview.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/stackview.qml
diff --git a/tests/auto/accessibility/data/defaults/swipedelegate.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/swipedelegate.qml
index d3724d4d..d3724d4d 100644
--- a/tests/auto/accessibility/data/defaults/swipedelegate.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/swipedelegate.qml
diff --git a/tests/auto/accessibility/data/defaults/swipeview.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/swipeview.qml
index 9eb82216..9eb82216 100644
--- a/tests/auto/accessibility/data/defaults/swipeview.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/swipeview.qml
diff --git a/tests/auto/accessibility/data/defaults/switch.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/switch.qml
index 00213086..00213086 100644
--- a/tests/auto/accessibility/data/defaults/switch.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/switch.qml
diff --git a/tests/auto/accessibility/data/defaults/switchdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/switchdelegate.qml
index 9f71ed68..9f71ed68 100644
--- a/tests/auto/accessibility/data/defaults/switchdelegate.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/switchdelegate.qml
diff --git a/tests/auto/accessibility/data/defaults/tabbar.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/tabbar.qml
index 423bfea9..423bfea9 100644
--- a/tests/auto/accessibility/data/defaults/tabbar.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/tabbar.qml
diff --git a/tests/auto/accessibility/data/defaults/tabbutton.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/tabbutton.qml
index ab9ea8ae..ab9ea8ae 100644
--- a/tests/auto/accessibility/data/defaults/tabbutton.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/tabbutton.qml
diff --git a/tests/auto/accessibility/data/defaults/textarea.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/textarea.qml
index 9a1f31d0..9a1f31d0 100644
--- a/tests/auto/accessibility/data/defaults/textarea.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/textarea.qml
diff --git a/tests/auto/accessibility/data/defaults/textfield.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/textfield.qml
index 42a16bae..42a16bae 100644
--- a/tests/auto/accessibility/data/defaults/textfield.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/textfield.qml
diff --git a/tests/auto/accessibility/data/defaults/toolbar.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/toolbar.qml
index 01b93d7d..01b93d7d 100644
--- a/tests/auto/accessibility/data/defaults/toolbar.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/toolbar.qml
diff --git a/tests/auto/accessibility/data/defaults/toolbutton.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/toolbutton.qml
index 40e1152e..40e1152e 100644
--- a/tests/auto/accessibility/data/defaults/toolbutton.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/toolbutton.qml
diff --git a/tests/auto/accessibility/data/defaults/tooltip.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/tooltip.qml
index f1c3cebe..f1c3cebe 100644
--- a/tests/auto/accessibility/data/defaults/tooltip.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/tooltip.qml
diff --git a/tests/auto/accessibility/data/defaults/tumbler.qml b/tests/auto/quickcontrols2/accessibility/data/defaults/tumbler.qml
index e3db175b..e3db175b 100644
--- a/tests/auto/accessibility/data/defaults/tumbler.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/defaults/tumbler.qml
diff --git a/tests/auto/accessibility/data/ordering/page.qml b/tests/auto/quickcontrols2/accessibility/data/ordering/page.qml
index 8efafe32..8efafe32 100644
--- a/tests/auto/accessibility/data/ordering/page.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/ordering/page.qml
diff --git a/tests/auto/accessibility/data/override/abstractbutton.qml b/tests/auto/quickcontrols2/accessibility/data/override/abstractbutton.qml
index ac8efe26..ac8efe26 100644
--- a/tests/auto/accessibility/data/override/abstractbutton.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/abstractbutton.qml
diff --git a/tests/auto/accessibility/data/override/busyindicator.qml b/tests/auto/quickcontrols2/accessibility/data/override/busyindicator.qml
index 439788d1..439788d1 100644
--- a/tests/auto/accessibility/data/override/busyindicator.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/busyindicator.qml
diff --git a/tests/auto/accessibility/data/override/button.qml b/tests/auto/quickcontrols2/accessibility/data/override/button.qml
index 578af86c..578af86c 100644
--- a/tests/auto/accessibility/data/override/button.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/button.qml
diff --git a/tests/auto/accessibility/data/override/checkbox.qml b/tests/auto/quickcontrols2/accessibility/data/override/checkbox.qml
index 5df73509..5df73509 100644
--- a/tests/auto/accessibility/data/override/checkbox.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/checkbox.qml
diff --git a/tests/auto/accessibility/data/override/checkdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/override/checkdelegate.qml
index 43f65d50..43f65d50 100644
--- a/tests/auto/accessibility/data/override/checkdelegate.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/checkdelegate.qml
diff --git a/tests/auto/accessibility/data/override/combobox.qml b/tests/auto/quickcontrols2/accessibility/data/override/combobox.qml
index fa6ed3b4..fa6ed3b4 100644
--- a/tests/auto/accessibility/data/override/combobox.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/combobox.qml
diff --git a/tests/auto/accessibility/data/override/container.qml b/tests/auto/quickcontrols2/accessibility/data/override/container.qml
index 4e73f341..4e73f341 100644
--- a/tests/auto/accessibility/data/override/container.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/container.qml
diff --git a/tests/auto/accessibility/data/override/control.qml b/tests/auto/quickcontrols2/accessibility/data/override/control.qml
index 9c2be461..9c2be461 100644
--- a/tests/auto/accessibility/data/override/control.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/control.qml
diff --git a/tests/auto/accessibility/data/override/dial.qml b/tests/auto/quickcontrols2/accessibility/data/override/dial.qml
index 8dbf0e37..8dbf0e37 100644
--- a/tests/auto/accessibility/data/override/dial.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/dial.qml
diff --git a/tests/auto/accessibility/data/override/dialog.qml b/tests/auto/quickcontrols2/accessibility/data/override/dialog.qml
index d1f31971..d1f31971 100644
--- a/tests/auto/accessibility/data/override/dialog.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/dialog.qml
diff --git a/tests/auto/accessibility/data/override/drawer.qml b/tests/auto/quickcontrols2/accessibility/data/override/drawer.qml
index 02e973e2..02e973e2 100644
--- a/tests/auto/accessibility/data/override/drawer.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/drawer.qml
diff --git a/tests/auto/accessibility/data/override/frame.qml b/tests/auto/quickcontrols2/accessibility/data/override/frame.qml
index 55086b35..55086b35 100644
--- a/tests/auto/accessibility/data/override/frame.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/frame.qml
diff --git a/tests/auto/accessibility/data/override/groupbox.qml b/tests/auto/quickcontrols2/accessibility/data/override/groupbox.qml
index d09d0845..d09d0845 100644
--- a/tests/auto/accessibility/data/override/groupbox.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/groupbox.qml
diff --git a/tests/auto/accessibility/data/override/itemdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/override/itemdelegate.qml
index 2f32cb75..2f32cb75 100644
--- a/tests/auto/accessibility/data/override/itemdelegate.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/itemdelegate.qml
diff --git a/tests/auto/accessibility/data/override/label.qml b/tests/auto/quickcontrols2/accessibility/data/override/label.qml
index 5c1310f8..5c1310f8 100644
--- a/tests/auto/accessibility/data/override/label.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/label.qml
diff --git a/tests/auto/accessibility/data/override/menu.qml b/tests/auto/quickcontrols2/accessibility/data/override/menu.qml
index 57a1b3d6..57a1b3d6 100644
--- a/tests/auto/accessibility/data/override/menu.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/menu.qml
diff --git a/tests/auto/accessibility/data/override/menuitem.qml b/tests/auto/quickcontrols2/accessibility/data/override/menuitem.qml
index e1c064f3..e1c064f3 100644
--- a/tests/auto/accessibility/data/override/menuitem.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/menuitem.qml
diff --git a/tests/auto/accessibility/data/override/page.qml b/tests/auto/quickcontrols2/accessibility/data/override/page.qml
index b3b87e8a..b3b87e8a 100644
--- a/tests/auto/accessibility/data/override/page.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/page.qml
diff --git a/tests/auto/accessibility/data/override/pageindicator.qml b/tests/auto/quickcontrols2/accessibility/data/override/pageindicator.qml
index f366464d..f366464d 100644
--- a/tests/auto/accessibility/data/override/pageindicator.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/pageindicator.qml
diff --git a/tests/auto/accessibility/data/override/pane.qml b/tests/auto/quickcontrols2/accessibility/data/override/pane.qml
index 7b57e9a9..7b57e9a9 100644
--- a/tests/auto/accessibility/data/override/pane.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/pane.qml
diff --git a/tests/auto/accessibility/data/override/popup.qml b/tests/auto/quickcontrols2/accessibility/data/override/popup.qml
index 9d8d5855..9d8d5855 100644
--- a/tests/auto/accessibility/data/override/popup.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/popup.qml
diff --git a/tests/auto/accessibility/data/override/progressbar.qml b/tests/auto/quickcontrols2/accessibility/data/override/progressbar.qml
index 58bd2ae1..58bd2ae1 100644
--- a/tests/auto/accessibility/data/override/progressbar.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/progressbar.qml
diff --git a/tests/auto/accessibility/data/override/radiobutton.qml b/tests/auto/quickcontrols2/accessibility/data/override/radiobutton.qml
index 3c555256..3c555256 100644
--- a/tests/auto/accessibility/data/override/radiobutton.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/radiobutton.qml
diff --git a/tests/auto/accessibility/data/override/radiodelegate.qml b/tests/auto/quickcontrols2/accessibility/data/override/radiodelegate.qml
index 883f963c..883f963c 100644
--- a/tests/auto/accessibility/data/override/radiodelegate.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/radiodelegate.qml
diff --git a/tests/auto/accessibility/data/override/rangeslider.qml b/tests/auto/quickcontrols2/accessibility/data/override/rangeslider.qml
index 675c34aa..675c34aa 100644
--- a/tests/auto/accessibility/data/override/rangeslider.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/rangeslider.qml
diff --git a/tests/auto/accessibility/data/override/roundbutton.qml b/tests/auto/quickcontrols2/accessibility/data/override/roundbutton.qml
index a793ee28..a793ee28 100644
--- a/tests/auto/accessibility/data/override/roundbutton.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/roundbutton.qml
diff --git a/tests/auto/accessibility/data/override/scrollbar.qml b/tests/auto/quickcontrols2/accessibility/data/override/scrollbar.qml
index 6b3e613c..6b3e613c 100644
--- a/tests/auto/accessibility/data/override/scrollbar.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/scrollbar.qml
diff --git a/tests/auto/accessibility/data/override/scrollindicator.qml b/tests/auto/quickcontrols2/accessibility/data/override/scrollindicator.qml
index 5cc1e5d4..5cc1e5d4 100644
--- a/tests/auto/accessibility/data/override/scrollindicator.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/scrollindicator.qml
diff --git a/tests/auto/accessibility/data/override/slider.qml b/tests/auto/quickcontrols2/accessibility/data/override/slider.qml
index 9239f8db..9239f8db 100644
--- a/tests/auto/accessibility/data/override/slider.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/slider.qml
diff --git a/tests/auto/accessibility/data/override/spinbox.qml b/tests/auto/quickcontrols2/accessibility/data/override/spinbox.qml
index 327f2a6d..327f2a6d 100644
--- a/tests/auto/accessibility/data/override/spinbox.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/spinbox.qml
diff --git a/tests/auto/accessibility/data/override/stackview.qml b/tests/auto/quickcontrols2/accessibility/data/override/stackview.qml
index dd3b8342..dd3b8342 100644
--- a/tests/auto/accessibility/data/override/stackview.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/stackview.qml
diff --git a/tests/auto/accessibility/data/override/swipedelegate.qml b/tests/auto/quickcontrols2/accessibility/data/override/swipedelegate.qml
index bc97fc93..bc97fc93 100644
--- a/tests/auto/accessibility/data/override/swipedelegate.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/swipedelegate.qml
diff --git a/tests/auto/accessibility/data/override/swipeview.qml b/tests/auto/quickcontrols2/accessibility/data/override/swipeview.qml
index 809b5362..809b5362 100644
--- a/tests/auto/accessibility/data/override/swipeview.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/swipeview.qml
diff --git a/tests/auto/accessibility/data/override/switch.qml b/tests/auto/quickcontrols2/accessibility/data/override/switch.qml
index 18e3eb70..18e3eb70 100644
--- a/tests/auto/accessibility/data/override/switch.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/switch.qml
diff --git a/tests/auto/accessibility/data/override/switchdelegate.qml b/tests/auto/quickcontrols2/accessibility/data/override/switchdelegate.qml
index 0c66f9e9..0c66f9e9 100644
--- a/tests/auto/accessibility/data/override/switchdelegate.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/switchdelegate.qml
diff --git a/tests/auto/accessibility/data/override/tabbar.qml b/tests/auto/quickcontrols2/accessibility/data/override/tabbar.qml
index a959f68c..a959f68c 100644
--- a/tests/auto/accessibility/data/override/tabbar.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/tabbar.qml
diff --git a/tests/auto/accessibility/data/override/tabbutton.qml b/tests/auto/quickcontrols2/accessibility/data/override/tabbutton.qml
index 1530a2d1..1530a2d1 100644
--- a/tests/auto/accessibility/data/override/tabbutton.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/tabbutton.qml
diff --git a/tests/auto/accessibility/data/override/textarea.qml b/tests/auto/quickcontrols2/accessibility/data/override/textarea.qml
index 2b142225..2b142225 100644
--- a/tests/auto/accessibility/data/override/textarea.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/textarea.qml
diff --git a/tests/auto/accessibility/data/override/textfield.qml b/tests/auto/quickcontrols2/accessibility/data/override/textfield.qml
index 42098b66..42098b66 100644
--- a/tests/auto/accessibility/data/override/textfield.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/textfield.qml
diff --git a/tests/auto/accessibility/data/override/toolbar.qml b/tests/auto/quickcontrols2/accessibility/data/override/toolbar.qml
index 97406f8c..97406f8c 100644
--- a/tests/auto/accessibility/data/override/toolbar.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/toolbar.qml
diff --git a/tests/auto/accessibility/data/override/toolbutton.qml b/tests/auto/quickcontrols2/accessibility/data/override/toolbutton.qml
index 5ecb427b..5ecb427b 100644
--- a/tests/auto/accessibility/data/override/toolbutton.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/toolbutton.qml
diff --git a/tests/auto/accessibility/data/override/tooltip.qml b/tests/auto/quickcontrols2/accessibility/data/override/tooltip.qml
index 1a4c3a99..1a4c3a99 100644
--- a/tests/auto/accessibility/data/override/tooltip.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/tooltip.qml
diff --git a/tests/auto/accessibility/data/override/tumbler.qml b/tests/auto/quickcontrols2/accessibility/data/override/tumbler.qml
index 947f66cd..947f66cd 100644
--- a/tests/auto/accessibility/data/override/tumbler.qml
+++ b/tests/auto/quickcontrols2/accessibility/data/override/tumbler.qml
diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/quickcontrols2/accessibility/tst_accessibility.cpp
index f2cb8b60..f2cb8b60 100644
--- a/tests/auto/accessibility/tst_accessibility.cpp
+++ b/tests/auto/quickcontrols2/accessibility/tst_accessibility.cpp
diff --git a/tests/auto/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt
index 1b41ce03..1b41ce03 100644
--- a/tests/auto/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt
diff --git a/tests/auto/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt
index 4c7accb3..4c7accb3 100644
--- a/tests/auto/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt
diff --git a/tests/auto/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt
index fdac69d6..fdac69d6 100644
--- a/tests/auto/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt
diff --git a/tests/auto/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt
index 07ba810c..07ba810c 100644
--- a/tests/auto/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt
diff --git a/tests/auto/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt
index db7b454b..db7b454b 100644
--- a/tests/auto/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt
diff --git a/tests/auto/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt
index 21b78d63..21b78d63 100644
--- a/tests/auto/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols2/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/quickcontrols2/cmake/CMakeLists.txt
index 0c6723dc..0c6723dc 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/cmake/CMakeLists.txt
diff --git a/tests/auto/controls/CMakeLists.txt b/tests/auto/quickcontrols2/controls/CMakeLists.txt
index 9e80b765..9e80b765 100644
--- a/tests/auto/controls/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/controls/CMakeLists.txt
diff --git a/tests/auto/controls/basic/BLACKLIST b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
index 47634070..47634070 100644
--- a/tests/auto/controls/basic/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
diff --git a/tests/auto/controls/basic/CMakeLists.txt b/tests/auto/quickcontrols2/controls/basic/CMakeLists.txt
index 55112e1e..63a3f1a4 100644
--- a/tests/auto/controls/basic/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/controls/basic/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_test(tst_basic
     SOURCES
         tst_basic.cpp
     DEFINES
-        TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../tests/auto/controls/data\\\"
+        TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../data\\\"
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::QuickControls2
diff --git a/tests/auto/controls/basic/dependencies.qml b/tests/auto/quickcontrols2/controls/basic/dependencies.qml
index f7d87422..f7d87422 100644
--- a/tests/auto/controls/basic/dependencies.qml
+++ b/tests/auto/quickcontrols2/controls/basic/dependencies.qml
diff --git a/tests/auto/controls/basic/tst_basic.cpp b/tests/auto/quickcontrols2/controls/basic/tst_basic.cpp
index 95d7e36a..95d7e36a 100644
--- a/tests/auto/controls/basic/tst_basic.cpp
+++ b/tests/auto/quickcontrols2/controls/basic/tst_basic.cpp
diff --git a/tests/auto/controls/data/SignalSequenceSpy.qml b/tests/auto/quickcontrols2/controls/data/SignalSequenceSpy.qml
index 40718c09..40718c09 100644
--- a/tests/auto/controls/data/SignalSequenceSpy.qml
+++ b/tests/auto/quickcontrols2/controls/data/SignalSequenceSpy.qml
diff --git a/tests/auto/controls/data/TestItem.qml b/tests/auto/quickcontrols2/controls/data/TestItem.qml
index df81269c..df81269c 100644
--- a/tests/auto/controls/data/TestItem.qml
+++ b/tests/auto/quickcontrols2/controls/data/TestItem.qml
diff --git a/tests/auto/controls/data/TumblerDatePicker.qml b/tests/auto/quickcontrols2/controls/data/TumblerDatePicker.qml
index c11b504b..c11b504b 100644
--- a/tests/auto/controls/data/TumblerDatePicker.qml
+++ b/tests/auto/quickcontrols2/controls/data/TumblerDatePicker.qml
diff --git a/tests/auto/controls/data/TumblerListView.qml b/tests/auto/quickcontrols2/controls/data/TumblerListView.qml
index a581c432..a581c432 100644
--- a/tests/auto/controls/data/TumblerListView.qml
+++ b/tests/auto/quickcontrols2/controls/data/TumblerListView.qml
diff --git a/tests/auto/controls/data/TumblerPathView.qml b/tests/auto/quickcontrols2/controls/data/TumblerPathView.qml
index 0f9be0e9..0f9be0e9 100644
--- a/tests/auto/controls/data/TumblerPathView.qml
+++ b/tests/auto/quickcontrols2/controls/data/TumblerPathView.qml
diff --git a/tests/auto/controls/data/splitview/fillItemInMiddle.qml b/tests/auto/quickcontrols2/controls/data/splitview/fillItemInMiddle.qml
index 0acac9eb..0acac9eb 100644
--- a/tests/auto/controls/data/splitview/fillItemInMiddle.qml
+++ b/tests/auto/quickcontrols2/controls/data/splitview/fillItemInMiddle.qml
diff --git a/tests/auto/controls/data/splitview/fillItemOnLeft.qml b/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnLeft.qml
index 6f9c6e0b..6f9c6e0b 100644
--- a/tests/auto/controls/data/splitview/fillItemOnLeft.qml
+++ b/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnLeft.qml
diff --git a/tests/auto/controls/data/splitview/fillItemOnTop.qml b/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnTop.qml
index 2955aa61..2955aa61 100644
--- a/tests/auto/controls/data/splitview/fillItemOnTop.qml
+++ b/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnTop.qml
diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/quickcontrols2/controls/data/tst_abstractbutton.qml
index 00f8affd..00f8affd 100644
--- a/tests/auto/controls/data/tst_abstractbutton.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_abstractbutton.qml
diff --git a/tests/auto/controls/data/tst_action.qml b/tests/auto/quickcontrols2/controls/data/tst_action.qml
index eded64b1..eded64b1 100644
--- a/tests/auto/controls/data/tst_action.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_action.qml
diff --git a/tests/auto/controls/data/tst_actiongroup.qml b/tests/auto/quickcontrols2/controls/data/tst_actiongroup.qml
index e4ea5679..e4ea5679 100644
--- a/tests/auto/controls/data/tst_actiongroup.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_actiongroup.qml
diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/quickcontrols2/controls/data/tst_busyindicator.qml
index 9353c338..9353c338 100644
--- a/tests/auto/controls/data/tst_busyindicator.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_busyindicator.qml
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/quickcontrols2/controls/data/tst_button.qml
index a6ec4faa..a6ec4faa 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_button.qml
diff --git a/tests/auto/controls/data/tst_buttongroup.qml b/tests/auto/quickcontrols2/controls/data/tst_buttongroup.qml
index 138c0e24..138c0e24 100644
--- a/tests/auto/controls/data/tst_buttongroup.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_buttongroup.qml
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/quickcontrols2/controls/data/tst_checkbox.qml
index 81c3d6ca..81c3d6ca 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_checkbox.qml
diff --git a/tests/auto/controls/data/tst_checkdelegate.qml b/tests/auto/quickcontrols2/controls/data/tst_checkdelegate.qml
index 70f1ae9d..70f1ae9d 100644
--- a/tests/auto/controls/data/tst_checkdelegate.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_checkdelegate.qml
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/quickcontrols2/controls/data/tst_combobox.qml
index 5359f63c..5359f63c 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_combobox.qml
diff --git a/tests/auto/controls/data/tst_container.qml b/tests/auto/quickcontrols2/controls/data/tst_container.qml
index be2b9a12..be2b9a12 100644
--- a/tests/auto/controls/data/tst_container.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_container.qml
diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/quickcontrols2/controls/data/tst_control.qml
index 4afa719e..4afa719e 100644
--- a/tests/auto/controls/data/tst_control.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_control.qml
diff --git a/tests/auto/controls/data/tst_delaybutton.qml b/tests/auto/quickcontrols2/controls/data/tst_delaybutton.qml
index 731caf86..731caf86 100644
--- a/tests/auto/controls/data/tst_delaybutton.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_delaybutton.qml
diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/quickcontrols2/controls/data/tst_dial.qml
index 2d0c702e..2d0c702e 100644
--- a/tests/auto/controls/data/tst_dial.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_dial.qml
diff --git a/tests/auto/controls/data/tst_dialog.qml b/tests/auto/quickcontrols2/controls/data/tst_dialog.qml
index b227d82e..b227d82e 100644
--- a/tests/auto/controls/data/tst_dialog.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_dialog.qml
diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/quickcontrols2/controls/data/tst_dialogbuttonbox.qml
index 706bf10d..706bf10d 100644
--- a/tests/auto/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_dialogbuttonbox.qml
diff --git a/tests/auto/controls/data/tst_frame.qml b/tests/auto/quickcontrols2/controls/data/tst_frame.qml
index 95c69144..95c69144 100644
--- a/tests/auto/controls/data/tst_frame.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_frame.qml
diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/quickcontrols2/controls/data/tst_groupbox.qml
index ed714897..ed714897 100644
--- a/tests/auto/controls/data/tst_groupbox.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_groupbox.qml
diff --git a/tests/auto/controls/data/tst_itemdelegate.qml b/tests/auto/quickcontrols2/controls/data/tst_itemdelegate.qml
index 7fa4e9e4..7fa4e9e4 100644
--- a/tests/auto/controls/data/tst_itemdelegate.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_itemdelegate.qml
diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/quickcontrols2/controls/data/tst_label.qml
index d6efb137..d6efb137 100644
--- a/tests/auto/controls/data/tst_label.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_label.qml
diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/quickcontrols2/controls/data/tst_menuitem.qml
index 713c030e..713c030e 100644
--- a/tests/auto/controls/data/tst_menuitem.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_menuitem.qml
diff --git a/tests/auto/controls/data/tst_page.qml b/tests/auto/quickcontrols2/controls/data/tst_page.qml
index ae78a125..ae78a125 100644
--- a/tests/auto/controls/data/tst_page.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_page.qml
diff --git a/tests/auto/controls/data/tst_pageindicator.qml b/tests/auto/quickcontrols2/controls/data/tst_pageindicator.qml
index 765c52a7..765c52a7 100644
--- a/tests/auto/controls/data/tst_pageindicator.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_pageindicator.qml
diff --git a/tests/auto/controls/data/tst_pane.qml b/tests/auto/quickcontrols2/controls/data/tst_pane.qml
index d44d7424..d44d7424 100644
--- a/tests/auto/controls/data/tst_pane.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_pane.qml
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/quickcontrols2/controls/data/tst_popup.qml
index 145f5552..145f5552 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_popup.qml
diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/quickcontrols2/controls/data/tst_progressbar.qml
index 2d264409..2d264409 100644
--- a/tests/auto/controls/data/tst_progressbar.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_progressbar.qml
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/quickcontrols2/controls/data/tst_radiobutton.qml
index 42ef9a15..42ef9a15 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_radiobutton.qml
diff --git a/tests/auto/controls/data/tst_radiodelegate.qml b/tests/auto/quickcontrols2/controls/data/tst_radiodelegate.qml
index 87984b2c..87984b2c 100644
--- a/tests/auto/controls/data/tst_radiodelegate.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_radiodelegate.qml
diff --git a/tests/auto/controls/data/tst_rangeslider.qml b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
index 5e4d7150..5e4d7150 100644
--- a/tests/auto/controls/data/tst_rangeslider.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
diff --git a/tests/auto/controls/data/tst_roundbutton.qml b/tests/auto/quickcontrols2/controls/data/tst_roundbutton.qml
index d7a8832c..d7a8832c 100644
--- a/tests/auto/controls/data/tst_roundbutton.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_roundbutton.qml
diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/quickcontrols2/controls/data/tst_scrollbar.qml
index f15983a9..f15983a9 100644
--- a/tests/auto/controls/data/tst_scrollbar.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_scrollbar.qml
diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/quickcontrols2/controls/data/tst_scrollindicator.qml
index 5f6006d4..5f6006d4 100644
--- a/tests/auto/controls/data/tst_scrollindicator.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_scrollindicator.qml
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/quickcontrols2/controls/data/tst_scrollview.qml
index 46afa503..46afa503 100644
--- a/tests/auto/controls/data/tst_scrollview.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_scrollview.qml
diff --git a/tests/auto/controls/data/tst_selectionrectangle.qml b/tests/auto/quickcontrols2/controls/data/tst_selectionrectangle.qml
index 13ddf00f..13ddf00f 100644
--- a/tests/auto/controls/data/tst_selectionrectangle.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_selectionrectangle.qml
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/quickcontrols2/controls/data/tst_slider.qml
index d105473c..d105473c 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_slider.qml
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/quickcontrols2/controls/data/tst_spinbox.qml
index 6220a857..6220a857 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_spinbox.qml
diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/quickcontrols2/controls/data/tst_splitview.qml
index b9ace27e..b9ace27e 100644
--- a/tests/auto/controls/data/tst_splitview.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_splitview.qml
diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/quickcontrols2/controls/data/tst_stackview.qml
index a3df827a..a3df827a 100644
--- a/tests/auto/controls/data/tst_stackview.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_stackview.qml
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/quickcontrols2/controls/data/tst_swipedelegate.qml
index 7b4fdcd1..7b4fdcd1 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_swipedelegate.qml
diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/quickcontrols2/controls/data/tst_swipeview.qml
index 68b91c35..68b91c35 100644
--- a/tests/auto/controls/data/tst_swipeview.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_swipeview.qml
diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/quickcontrols2/controls/data/tst_switch.qml
index 7bd09399..7bd09399 100644
--- a/tests/auto/controls/data/tst_switch.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_switch.qml
diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/quickcontrols2/controls/data/tst_switchdelegate.qml
index a1ff9f4a..a1ff9f4a 100644
--- a/tests/auto/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_switchdelegate.qml
diff --git a/tests/auto/controls/data/tst_tabbar.qml b/tests/auto/quickcontrols2/controls/data/tst_tabbar.qml
index 3659a0ab..3659a0ab 100644
--- a/tests/auto/controls/data/tst_tabbar.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_tabbar.qml
diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/quickcontrols2/controls/data/tst_tabbutton.qml
index 3f809209..3f809209 100644
--- a/tests/auto/controls/data/tst_tabbutton.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_tabbutton.qml
diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/quickcontrols2/controls/data/tst_textarea.qml
index 7f0b52fc..7f0b52fc 100644
--- a/tests/auto/controls/data/tst_textarea.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_textarea.qml
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/quickcontrols2/controls/data/tst_textfield.qml
index f9b0587f..f9b0587f 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_textfield.qml
diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/quickcontrols2/controls/data/tst_toolbar.qml
index b35a927d..b35a927d 100644
--- a/tests/auto/controls/data/tst_toolbar.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_toolbar.qml
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/quickcontrols2/controls/data/tst_toolbutton.qml
index a7acd05a..a7acd05a 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_toolbutton.qml
diff --git a/tests/auto/controls/data/tst_toolseparator.qml b/tests/auto/quickcontrols2/controls/data/tst_toolseparator.qml
index 41c161dd..41c161dd 100644
--- a/tests/auto/controls/data/tst_toolseparator.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_toolseparator.qml
diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/quickcontrols2/controls/data/tst_tooltip.qml
index 2f98a5f3..2f98a5f3 100644
--- a/tests/auto/controls/data/tst_tooltip.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_tooltip.qml
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/quickcontrols2/controls/data/tst_tumbler.qml
index 3a09bd9f..3a09bd9f 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/quickcontrols2/controls/data/tst_tumbler.qml
diff --git a/tests/auto/controls/fusion/BLACKLIST b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
index 47634070..47634070 100644
--- a/tests/auto/controls/fusion/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
diff --git a/tests/auto/controls/fusion/CMakeLists.txt b/tests/auto/quickcontrols2/controls/fusion/CMakeLists.txt
index 03c52605..96d4fa5a 100644
--- a/tests/auto/controls/fusion/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/controls/fusion/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_test(tst_fusion
     SOURCES
         tst_fusion.cpp
     DEFINES
-        TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../tests/auto/controls/data\\\"
+        TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../data\\\"
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::QuickControls2
diff --git a/tests/auto/controls/fusion/dependencies.qml b/tests/auto/quickcontrols2/controls/fusion/dependencies.qml
index f2e40e60..f2e40e60 100644
--- a/tests/auto/controls/fusion/dependencies.qml
+++ b/tests/auto/quickcontrols2/controls/fusion/dependencies.qml
diff --git a/tests/auto/controls/fusion/tst_fusion.cpp b/tests/auto/quickcontrols2/controls/fusion/tst_fusion.cpp
index 7528ccea..7528ccea 100644
--- a/tests/auto/controls/fusion/tst_fusion.cpp
+++ b/tests/auto/quickcontrols2/controls/fusion/tst_fusion.cpp
diff --git a/tests/auto/controls/imagine/BLACKLIST b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
index 47634070..47634070 100644
--- a/tests/auto/controls/imagine/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
diff --git a/tests/auto/controls/imagine/CMakeLists.txt b/tests/auto/quickcontrols2/controls/imagine/CMakeLists.txt
index faef2e06..be47d59d 100644
--- a/tests/auto/controls/imagine/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/controls/imagine/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_test(tst_imagine
     SOURCES
         tst_imagine.cpp
     DEFINES
-        TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../tests/auto/controls/data\\\"
+        TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../data\\\"
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::QuickControls2
diff --git a/tests/auto/controls/imagine/dependencies.qml b/tests/auto/quickcontrols2/controls/imagine/dependencies.qml
index 9a31141b..9a31141b 100644
--- a/tests/auto/controls/imagine/dependencies.qml
+++ b/tests/auto/quickcontrols2/controls/imagine/dependencies.qml
diff --git a/tests/auto/controls/imagine/tst_imagine.cpp b/tests/auto/quickcontrols2/controls/imagine/tst_imagine.cpp
index 9db7ed4d..9db7ed4d 100644
--- a/tests/auto/controls/imagine/tst_imagine.cpp
+++ b/tests/auto/quickcontrols2/controls/imagine/tst_imagine.cpp
diff --git a/tests/auto/controls/material/BLACKLIST b/tests/auto/quickcontrols2/controls/material/BLACKLIST
index 47634070..47634070 100644
--- a/tests/auto/controls/material/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
diff --git a/tests/auto/controls/material/CMakeLists.txt b/tests/auto/quickcontrols2/controls/material/CMakeLists.txt
index b8505b9b..7aa6c25d 100644
--- a/tests/auto/controls/material/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/controls/material/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_test(tst_material
     SOURCES
         tst_material.cpp
     DEFINES
-        TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../tests/auto/controls/data\\\"
+        TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../data\\\"
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::QuickControls2
diff --git a/tests/auto/controls/material/dependencies.qml b/tests/auto/quickcontrols2/controls/material/dependencies.qml
index 8bcf0301..8bcf0301 100644
--- a/tests/auto/controls/material/dependencies.qml
+++ b/tests/auto/quickcontrols2/controls/material/dependencies.qml
diff --git a/tests/auto/controls/material/tst_material.cpp b/tests/auto/quickcontrols2/controls/material/tst_material.cpp
index ae8bb3a1..ae8bb3a1 100644
--- a/tests/auto/controls/material/tst_material.cpp
+++ b/tests/auto/quickcontrols2/controls/material/tst_material.cpp
diff --git a/tests/auto/controls/universal/BLACKLIST b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
index 47634070..47634070 100644
--- a/tests/auto/controls/universal/BLACKLIST
+++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
diff --git a/tests/auto/controls/universal/CMakeLists.txt b/tests/auto/quickcontrols2/controls/universal/CMakeLists.txt
index 5f9024cd..c009750e 100644
--- a/tests/auto/controls/universal/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/controls/universal/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_test(tst_universal
     SOURCES
         tst_universal.cpp
     DEFINES
-        TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../tests/auto/controls/data\\\"
+        TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../data\\\"
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::QuickControls2
diff --git a/tests/auto/controls/universal/dependencies.qml b/tests/auto/quickcontrols2/controls/universal/dependencies.qml
index 8ba71c83..8ba71c83 100644
--- a/tests/auto/controls/universal/dependencies.qml
+++ b/tests/auto/quickcontrols2/controls/universal/dependencies.qml
diff --git a/tests/auto/controls/universal/tst_universal.cpp b/tests/auto/quickcontrols2/controls/universal/tst_universal.cpp
index db5b560e..db5b560e 100644
--- a/tests/auto/controls/universal/tst_universal.cpp
+++ b/tests/auto/quickcontrols2/controls/universal/tst_universal.cpp
diff --git a/tests/auto/cursor/CMakeLists.txt b/tests/auto/quickcontrols2/cursor/CMakeLists.txt
index 5f02758c..d764836e 100644
--- a/tests/auto/cursor/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/cursor/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_cursor
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_cursor.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/cursor/data/buttons.qml b/tests/auto/quickcontrols2/cursor/data/buttons.qml
index eb7e27cf..eb7e27cf 100644
--- a/tests/auto/cursor/data/buttons.qml
+++ b/tests/auto/quickcontrols2/cursor/data/buttons.qml
diff --git a/tests/auto/cursor/data/containers.qml b/tests/auto/quickcontrols2/cursor/data/containers.qml
index 0e722971..0e722971 100644
--- a/tests/auto/cursor/data/containers.qml
+++ b/tests/auto/quickcontrols2/cursor/data/containers.qml
diff --git a/tests/auto/cursor/data/editable.qml b/tests/auto/quickcontrols2/cursor/data/editable.qml
index 04bf4b7c..04bf4b7c 100644
--- a/tests/auto/cursor/data/editable.qml
+++ b/tests/auto/quickcontrols2/cursor/data/editable.qml
diff --git a/tests/auto/cursor/data/pageindicator.qml b/tests/auto/quickcontrols2/cursor/data/pageindicator.qml
index f71fbf75..f71fbf75 100644
--- a/tests/auto/cursor/data/pageindicator.qml
+++ b/tests/auto/quickcontrols2/cursor/data/pageindicator.qml
diff --git a/tests/auto/cursor/data/scrollbar.qml b/tests/auto/quickcontrols2/cursor/data/scrollbar.qml
index 997abd4b..997abd4b 100644
--- a/tests/auto/cursor/data/scrollbar.qml
+++ b/tests/auto/quickcontrols2/cursor/data/scrollbar.qml
diff --git a/tests/auto/cursor/data/sliders.qml b/tests/auto/quickcontrols2/cursor/data/sliders.qml
index 687450ec..687450ec 100644
--- a/tests/auto/cursor/data/sliders.qml
+++ b/tests/auto/quickcontrols2/cursor/data/sliders.qml
diff --git a/tests/auto/cursor/tst_cursor.cpp b/tests/auto/quickcontrols2/cursor/tst_cursor.cpp
index 37a9e0c1..37a9e0c1 100644
--- a/tests/auto/cursor/tst_cursor.cpp
+++ b/tests/auto/quickcontrols2/cursor/tst_cursor.cpp
diff --git a/tests/auto/customization/CMakeLists.txt b/tests/auto/quickcontrols2/customization/CMakeLists.txt
index 54e689f4..56bcaf11 100644
--- a/tests/auto/customization/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/customization/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_customization
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_customization.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/customization/data/styles/empty/AbstractButton.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/AbstractButton.qml
index b30d4a56..b30d4a56 100644
--- a/tests/auto/customization/data/styles/empty/AbstractButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/AbstractButton.qml
diff --git a/tests/auto/customization/data/styles/empty/ApplicationWindow.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/ApplicationWindow.qml
index 6a1f1b09..6a1f1b09 100644
--- a/tests/auto/customization/data/styles/empty/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/ApplicationWindow.qml
diff --git a/tests/auto/customization/data/styles/empty/BusyIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/BusyIndicator.qml
index 388de3af..388de3af 100644
--- a/tests/auto/customization/data/styles/empty/BusyIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/BusyIndicator.qml
diff --git a/tests/auto/customization/data/styles/empty/Button.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Button.qml
index 20426d2e..20426d2e 100644
--- a/tests/auto/customization/data/styles/empty/Button.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Button.qml
diff --git a/tests/auto/customization/data/styles/empty/CheckBox.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/CheckBox.qml
index 3d8b5a8e..3d8b5a8e 100644
--- a/tests/auto/customization/data/styles/empty/CheckBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/CheckBox.qml
diff --git a/tests/auto/customization/data/styles/empty/CheckDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/CheckDelegate.qml
index a0547ec4..a0547ec4 100644
--- a/tests/auto/customization/data/styles/empty/CheckDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/CheckDelegate.qml
diff --git a/tests/auto/customization/data/styles/empty/ComboBox.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/ComboBox.qml
index 84cf6e35..84cf6e35 100644
--- a/tests/auto/customization/data/styles/empty/ComboBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/ComboBox.qml
diff --git a/tests/auto/customization/data/styles/empty/Container.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Container.qml
index 7519d7bd..7519d7bd 100644
--- a/tests/auto/customization/data/styles/empty/Container.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Container.qml
diff --git a/tests/auto/customization/data/styles/empty/Control.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Control.qml
index 55a456c7..55a456c7 100644
--- a/tests/auto/customization/data/styles/empty/Control.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Control.qml
diff --git a/tests/auto/customization/data/styles/empty/DelayButton.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/DelayButton.qml
index ce34f25f..ce34f25f 100644
--- a/tests/auto/customization/data/styles/empty/DelayButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/DelayButton.qml
diff --git a/tests/auto/customization/data/styles/empty/Dial.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Dial.qml
index de83e564..de83e564 100644
--- a/tests/auto/customization/data/styles/empty/Dial.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Dial.qml
diff --git a/tests/auto/customization/data/styles/empty/Dialog.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Dialog.qml
index 8b056a88..8b056a88 100644
--- a/tests/auto/customization/data/styles/empty/Dialog.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Dialog.qml
diff --git a/tests/auto/customization/data/styles/empty/DialogButtonBox.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/DialogButtonBox.qml
index 5ce5f504..5ce5f504 100644
--- a/tests/auto/customization/data/styles/empty/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/DialogButtonBox.qml
diff --git a/tests/auto/customization/data/styles/empty/Drawer.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Drawer.qml
index b4da57c0..b4da57c0 100644
--- a/tests/auto/customization/data/styles/empty/Drawer.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Drawer.qml
diff --git a/tests/auto/customization/data/styles/empty/Frame.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Frame.qml
index 00f4d79c..00f4d79c 100644
--- a/tests/auto/customization/data/styles/empty/Frame.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Frame.qml
diff --git a/tests/auto/customization/data/styles/empty/GroupBox.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/GroupBox.qml
index 900770cd..900770cd 100644
--- a/tests/auto/customization/data/styles/empty/GroupBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/GroupBox.qml
diff --git a/tests/auto/customization/data/styles/empty/ItemDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/ItemDelegate.qml
index 19de468d..19de468d 100644
--- a/tests/auto/customization/data/styles/empty/ItemDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/ItemDelegate.qml
diff --git a/tests/auto/customization/data/styles/empty/Label.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Label.qml
index bfc4a839..bfc4a839 100644
--- a/tests/auto/customization/data/styles/empty/Label.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Label.qml
diff --git a/tests/auto/customization/data/styles/empty/Menu.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Menu.qml
index 27b8a014..27b8a014 100644
--- a/tests/auto/customization/data/styles/empty/Menu.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Menu.qml
diff --git a/tests/auto/customization/data/styles/empty/MenuBar.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBar.qml
index 24f7c6ed..24f7c6ed 100644
--- a/tests/auto/customization/data/styles/empty/MenuBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBar.qml
diff --git a/tests/auto/customization/data/styles/empty/MenuBarItem.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBarItem.qml
index d66e899a..d66e899a 100644
--- a/tests/auto/customization/data/styles/empty/MenuBarItem.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBarItem.qml
diff --git a/tests/auto/customization/data/styles/empty/MenuItem.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/MenuItem.qml
index 11f38a1b..11f38a1b 100644
--- a/tests/auto/customization/data/styles/empty/MenuItem.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/MenuItem.qml
diff --git a/tests/auto/customization/data/styles/empty/MenuSeparator.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/MenuSeparator.qml
index effd32c0..effd32c0 100644
--- a/tests/auto/customization/data/styles/empty/MenuSeparator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/MenuSeparator.qml
diff --git a/tests/auto/customization/data/styles/empty/Page.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Page.qml
index 353fb9cc..353fb9cc 100644
--- a/tests/auto/customization/data/styles/empty/Page.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Page.qml
diff --git a/tests/auto/customization/data/styles/empty/PageIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/PageIndicator.qml
index 98976ae2..98976ae2 100644
--- a/tests/auto/customization/data/styles/empty/PageIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/PageIndicator.qml
diff --git a/tests/auto/customization/data/styles/empty/Pane.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Pane.qml
index 2429e2c6..2429e2c6 100644
--- a/tests/auto/customization/data/styles/empty/Pane.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Pane.qml
diff --git a/tests/auto/customization/data/styles/empty/Popup.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Popup.qml
index fdcb49ac..fdcb49ac 100644
--- a/tests/auto/customization/data/styles/empty/Popup.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Popup.qml
diff --git a/tests/auto/customization/data/styles/empty/ProgressBar.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/ProgressBar.qml
index a2afa03b..a2afa03b 100644
--- a/tests/auto/customization/data/styles/empty/ProgressBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/ProgressBar.qml
diff --git a/tests/auto/customization/data/styles/empty/RadioButton.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/RadioButton.qml
index 87766292..87766292 100644
--- a/tests/auto/customization/data/styles/empty/RadioButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/RadioButton.qml
diff --git a/tests/auto/customization/data/styles/empty/RadioDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/RadioDelegate.qml
index bbb711c7..bbb711c7 100644
--- a/tests/auto/customization/data/styles/empty/RadioDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/RadioDelegate.qml
diff --git a/tests/auto/customization/data/styles/empty/RangeSlider.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/RangeSlider.qml
index 0043b407..0043b407 100644
--- a/tests/auto/customization/data/styles/empty/RangeSlider.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/RangeSlider.qml
diff --git a/tests/auto/customization/data/styles/empty/RoundButton.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/RoundButton.qml
index 5b06801d..5b06801d 100644
--- a/tests/auto/customization/data/styles/empty/RoundButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/RoundButton.qml
diff --git a/tests/auto/customization/data/styles/empty/ScrollBar.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollBar.qml
index 80a6782e..80a6782e 100644
--- a/tests/auto/customization/data/styles/empty/ScrollBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollBar.qml
diff --git a/tests/auto/customization/data/styles/empty/ScrollIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollIndicator.qml
index 56c73cb8..56c73cb8 100644
--- a/tests/auto/customization/data/styles/empty/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollIndicator.qml
diff --git a/tests/auto/customization/data/styles/empty/ScrollView.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollView.qml
index 198936c2..198936c2 100644
--- a/tests/auto/customization/data/styles/empty/ScrollView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollView.qml
diff --git a/tests/auto/customization/data/styles/empty/Slider.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Slider.qml
index 6cfa3e91..6cfa3e91 100644
--- a/tests/auto/customization/data/styles/empty/Slider.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Slider.qml
diff --git a/tests/auto/customization/data/styles/empty/SpinBox.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/SpinBox.qml
index 9e334ecf..9e334ecf 100644
--- a/tests/auto/customization/data/styles/empty/SpinBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/SpinBox.qml
diff --git a/tests/auto/customization/data/styles/empty/StackView.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/StackView.qml
index 0a55abf8..0a55abf8 100644
--- a/tests/auto/customization/data/styles/empty/StackView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/StackView.qml
diff --git a/tests/auto/customization/data/styles/empty/SwipeDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeDelegate.qml
index d05f1e9c..d05f1e9c 100644
--- a/tests/auto/customization/data/styles/empty/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeDelegate.qml
diff --git a/tests/auto/customization/data/styles/empty/SwipeView.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeView.qml
index 51b411aa..51b411aa 100644
--- a/tests/auto/customization/data/styles/empty/SwipeView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeView.qml
diff --git a/tests/auto/customization/data/styles/empty/Switch.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Switch.qml
index da00b0e8..da00b0e8 100644
--- a/tests/auto/customization/data/styles/empty/Switch.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Switch.qml
diff --git a/tests/auto/customization/data/styles/empty/SwitchDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/SwitchDelegate.qml
index fe0a9f52..fe0a9f52 100644
--- a/tests/auto/customization/data/styles/empty/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/SwitchDelegate.qml
diff --git a/tests/auto/customization/data/styles/empty/TabBar.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/TabBar.qml
index 0f38b660..0f38b660 100644
--- a/tests/auto/customization/data/styles/empty/TabBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/TabBar.qml
diff --git a/tests/auto/customization/data/styles/empty/TabButton.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/TabButton.qml
index 6ee89636..6ee89636 100644
--- a/tests/auto/customization/data/styles/empty/TabButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/TabButton.qml
diff --git a/tests/auto/customization/data/styles/empty/TextArea.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/TextArea.qml
index e2ee7866..e2ee7866 100644
--- a/tests/auto/customization/data/styles/empty/TextArea.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/TextArea.qml
diff --git a/tests/auto/customization/data/styles/empty/TextField.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/TextField.qml
index 3fcf63d5..3fcf63d5 100644
--- a/tests/auto/customization/data/styles/empty/TextField.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/TextField.qml
diff --git a/tests/auto/customization/data/styles/empty/ToolBar.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/ToolBar.qml
index 6696336d..6696336d 100644
--- a/tests/auto/customization/data/styles/empty/ToolBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/ToolBar.qml
diff --git a/tests/auto/customization/data/styles/empty/ToolButton.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/ToolButton.qml
index 8d4ef1b5..8d4ef1b5 100644
--- a/tests/auto/customization/data/styles/empty/ToolButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/ToolButton.qml
diff --git a/tests/auto/customization/data/styles/empty/ToolSeparator.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/ToolSeparator.qml
index 63985f7f..63985f7f 100644
--- a/tests/auto/customization/data/styles/empty/ToolSeparator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/ToolSeparator.qml
diff --git a/tests/auto/customization/data/styles/empty/ToolTip.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/ToolTip.qml
index a1aff941..a1aff941 100644
--- a/tests/auto/customization/data/styles/empty/ToolTip.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/ToolTip.qml
diff --git a/tests/auto/customization/data/styles/empty/Tumbler.qml b/tests/auto/quickcontrols2/customization/data/styles/empty/Tumbler.qml
index c8b3bfeb..c8b3bfeb 100644
--- a/tests/auto/customization/data/styles/empty/Tumbler.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/Tumbler.qml
diff --git a/tests/auto/customization/data/styles/empty/qmldir b/tests/auto/quickcontrols2/customization/data/styles/empty/qmldir
index a5fcc4c7..a5fcc4c7 100644
--- a/tests/auto/customization/data/styles/empty/qmldir
+++ b/tests/auto/quickcontrols2/customization/data/styles/empty/qmldir
diff --git a/tests/auto/customization/data/styles/identified/AbstractButton.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/AbstractButton.qml
index 1c5bd318..1c5bd318 100644
--- a/tests/auto/customization/data/styles/identified/AbstractButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/AbstractButton.qml
diff --git a/tests/auto/customization/data/styles/identified/ApplicationWindow.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/ApplicationWindow.qml
index dc3f0db1..dc3f0db1 100644
--- a/tests/auto/customization/data/styles/identified/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/ApplicationWindow.qml
diff --git a/tests/auto/customization/data/styles/identified/BusyIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/BusyIndicator.qml
index 2deab679..2deab679 100644
--- a/tests/auto/customization/data/styles/identified/BusyIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/BusyIndicator.qml
diff --git a/tests/auto/customization/data/styles/identified/Button.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Button.qml
index dc805080..dc805080 100644
--- a/tests/auto/customization/data/styles/identified/Button.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Button.qml
diff --git a/tests/auto/customization/data/styles/identified/CheckBox.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/CheckBox.qml
index 13f98af9..13f98af9 100644
--- a/tests/auto/customization/data/styles/identified/CheckBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/CheckBox.qml
diff --git a/tests/auto/customization/data/styles/identified/CheckDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/CheckDelegate.qml
index b0d8a8d2..b0d8a8d2 100644
--- a/tests/auto/customization/data/styles/identified/CheckDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/CheckDelegate.qml
diff --git a/tests/auto/customization/data/styles/identified/ComboBox.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/ComboBox.qml
index ff117ce8..ff117ce8 100644
--- a/tests/auto/customization/data/styles/identified/ComboBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/ComboBox.qml
diff --git a/tests/auto/customization/data/styles/identified/Container.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Container.qml
index a282528d..a282528d 100644
--- a/tests/auto/customization/data/styles/identified/Container.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Container.qml
diff --git a/tests/auto/customization/data/styles/identified/Control.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Control.qml
index 90229e47..90229e47 100644
--- a/tests/auto/customization/data/styles/identified/Control.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Control.qml
diff --git a/tests/auto/customization/data/styles/identified/DelayButton.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/DelayButton.qml
index 90f980ea..90f980ea 100644
--- a/tests/auto/customization/data/styles/identified/DelayButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/DelayButton.qml
diff --git a/tests/auto/customization/data/styles/identified/Dial.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Dial.qml
index 9260972c..9260972c 100644
--- a/tests/auto/customization/data/styles/identified/Dial.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Dial.qml
diff --git a/tests/auto/customization/data/styles/identified/Dialog.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Dialog.qml
index 6392be7d..6392be7d 100644
--- a/tests/auto/customization/data/styles/identified/Dialog.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Dialog.qml
diff --git a/tests/auto/customization/data/styles/identified/DialogButtonBox.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/DialogButtonBox.qml
index 11c596a1..11c596a1 100644
--- a/tests/auto/customization/data/styles/identified/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/DialogButtonBox.qml
diff --git a/tests/auto/customization/data/styles/identified/Drawer.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Drawer.qml
index 6b340f2a..6b340f2a 100644
--- a/tests/auto/customization/data/styles/identified/Drawer.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Drawer.qml
diff --git a/tests/auto/customization/data/styles/identified/Frame.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Frame.qml
index 830ac584..830ac584 100644
--- a/tests/auto/customization/data/styles/identified/Frame.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Frame.qml
diff --git a/tests/auto/customization/data/styles/identified/GroupBox.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/GroupBox.qml
index fffd44e8..fffd44e8 100644
--- a/tests/auto/customization/data/styles/identified/GroupBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/GroupBox.qml
diff --git a/tests/auto/customization/data/styles/identified/ItemDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/ItemDelegate.qml
index b04d2f59..b04d2f59 100644
--- a/tests/auto/customization/data/styles/identified/ItemDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/ItemDelegate.qml
diff --git a/tests/auto/customization/data/styles/identified/Label.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Label.qml
index 95d1f191..95d1f191 100644
--- a/tests/auto/customization/data/styles/identified/Label.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Label.qml
diff --git a/tests/auto/customization/data/styles/identified/Menu.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Menu.qml
index 66239254..66239254 100644
--- a/tests/auto/customization/data/styles/identified/Menu.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Menu.qml
diff --git a/tests/auto/customization/data/styles/identified/MenuBar.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBar.qml
index f815b73f..f815b73f 100644
--- a/tests/auto/customization/data/styles/identified/MenuBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBar.qml
diff --git a/tests/auto/customization/data/styles/identified/MenuBarItem.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBarItem.qml
index abf3be5d..abf3be5d 100644
--- a/tests/auto/customization/data/styles/identified/MenuBarItem.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBarItem.qml
diff --git a/tests/auto/customization/data/styles/identified/MenuItem.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/MenuItem.qml
index 3a174ecf..3a174ecf 100644
--- a/tests/auto/customization/data/styles/identified/MenuItem.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/MenuItem.qml
diff --git a/tests/auto/customization/data/styles/identified/MenuSeparator.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/MenuSeparator.qml
index 7ecb176b..7ecb176b 100644
--- a/tests/auto/customization/data/styles/identified/MenuSeparator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/MenuSeparator.qml
diff --git a/tests/auto/customization/data/styles/identified/Page.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Page.qml
index b2416247..b2416247 100644
--- a/tests/auto/customization/data/styles/identified/Page.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Page.qml
diff --git a/tests/auto/customization/data/styles/identified/PageIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/PageIndicator.qml
index 2370a334..2370a334 100644
--- a/tests/auto/customization/data/styles/identified/PageIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/PageIndicator.qml
diff --git a/tests/auto/customization/data/styles/identified/Pane.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Pane.qml
index 0dbf4b1c..0dbf4b1c 100644
--- a/tests/auto/customization/data/styles/identified/Pane.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Pane.qml
diff --git a/tests/auto/customization/data/styles/identified/Popup.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Popup.qml
index b6381170..b6381170 100644
--- a/tests/auto/customization/data/styles/identified/Popup.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Popup.qml
diff --git a/tests/auto/customization/data/styles/identified/ProgressBar.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/ProgressBar.qml
index dc7d7658..dc7d7658 100644
--- a/tests/auto/customization/data/styles/identified/ProgressBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/ProgressBar.qml
diff --git a/tests/auto/customization/data/styles/identified/RadioButton.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/RadioButton.qml
index 2b4a0b62..2b4a0b62 100644
--- a/tests/auto/customization/data/styles/identified/RadioButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/RadioButton.qml
diff --git a/tests/auto/customization/data/styles/identified/RadioDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/RadioDelegate.qml
index 75cda63d..75cda63d 100644
--- a/tests/auto/customization/data/styles/identified/RadioDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/RadioDelegate.qml
diff --git a/tests/auto/customization/data/styles/identified/RangeSlider.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/RangeSlider.qml
index fab56fcd..fab56fcd 100644
--- a/tests/auto/customization/data/styles/identified/RangeSlider.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/RangeSlider.qml
diff --git a/tests/auto/customization/data/styles/identified/RoundButton.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/RoundButton.qml
index ec075db3..ec075db3 100644
--- a/tests/auto/customization/data/styles/identified/RoundButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/RoundButton.qml
diff --git a/tests/auto/customization/data/styles/identified/ScrollBar.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollBar.qml
index 418f2908..418f2908 100644
--- a/tests/auto/customization/data/styles/identified/ScrollBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollBar.qml
diff --git a/tests/auto/customization/data/styles/identified/ScrollIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollIndicator.qml
index b427b757..b427b757 100644
--- a/tests/auto/customization/data/styles/identified/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollIndicator.qml
diff --git a/tests/auto/customization/data/styles/identified/ScrollView.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollView.qml
index 7f4e2c40..7f4e2c40 100644
--- a/tests/auto/customization/data/styles/identified/ScrollView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollView.qml
diff --git a/tests/auto/customization/data/styles/identified/Slider.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Slider.qml
index 88c5b22f..88c5b22f 100644
--- a/tests/auto/customization/data/styles/identified/Slider.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Slider.qml
diff --git a/tests/auto/customization/data/styles/identified/SpinBox.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/SpinBox.qml
index 0c058269..0c058269 100644
--- a/tests/auto/customization/data/styles/identified/SpinBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/SpinBox.qml
diff --git a/tests/auto/customization/data/styles/identified/StackView.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/StackView.qml
index 1bc5bf50..1bc5bf50 100644
--- a/tests/auto/customization/data/styles/identified/StackView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/StackView.qml
diff --git a/tests/auto/customization/data/styles/identified/SwipeDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeDelegate.qml
index dadb54a5..dadb54a5 100644
--- a/tests/auto/customization/data/styles/identified/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeDelegate.qml
diff --git a/tests/auto/customization/data/styles/identified/SwipeView.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeView.qml
index aa256d99..aa256d99 100644
--- a/tests/auto/customization/data/styles/identified/SwipeView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeView.qml
diff --git a/tests/auto/customization/data/styles/identified/Switch.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Switch.qml
index be10b520..be10b520 100644
--- a/tests/auto/customization/data/styles/identified/Switch.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Switch.qml
diff --git a/tests/auto/customization/data/styles/identified/SwitchDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/SwitchDelegate.qml
index 7205c973..7205c973 100644
--- a/tests/auto/customization/data/styles/identified/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/SwitchDelegate.qml
diff --git a/tests/auto/customization/data/styles/identified/TabBar.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/TabBar.qml
index 5d360cb1..5d360cb1 100644
--- a/tests/auto/customization/data/styles/identified/TabBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/TabBar.qml
diff --git a/tests/auto/customization/data/styles/identified/TabButton.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/TabButton.qml
index bc065b22..bc065b22 100644
--- a/tests/auto/customization/data/styles/identified/TabButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/TabButton.qml
diff --git a/tests/auto/customization/data/styles/identified/TextArea.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/TextArea.qml
index 56671240..56671240 100644
--- a/tests/auto/customization/data/styles/identified/TextArea.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/TextArea.qml
diff --git a/tests/auto/customization/data/styles/identified/TextField.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/TextField.qml
index 1fef7ab5..1fef7ab5 100644
--- a/tests/auto/customization/data/styles/identified/TextField.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/TextField.qml
diff --git a/tests/auto/customization/data/styles/identified/ToolBar.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/ToolBar.qml
index 2061949c..2061949c 100644
--- a/tests/auto/customization/data/styles/identified/ToolBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/ToolBar.qml
diff --git a/tests/auto/customization/data/styles/identified/ToolButton.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/ToolButton.qml
index 253391a8..253391a8 100644
--- a/tests/auto/customization/data/styles/identified/ToolButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/ToolButton.qml
diff --git a/tests/auto/customization/data/styles/identified/ToolSeparator.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/ToolSeparator.qml
index b8cf9daa..b8cf9daa 100644
--- a/tests/auto/customization/data/styles/identified/ToolSeparator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/ToolSeparator.qml
diff --git a/tests/auto/customization/data/styles/identified/ToolTip.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/ToolTip.qml
index 1ef95c99..1ef95c99 100644
--- a/tests/auto/customization/data/styles/identified/ToolTip.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/ToolTip.qml
diff --git a/tests/auto/customization/data/styles/identified/Tumbler.qml b/tests/auto/quickcontrols2/customization/data/styles/identified/Tumbler.qml
index 3bfdafc4..3bfdafc4 100644
--- a/tests/auto/customization/data/styles/identified/Tumbler.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/Tumbler.qml
diff --git a/tests/auto/customization/data/styles/identified/qmldir b/tests/auto/quickcontrols2/customization/data/styles/identified/qmldir
index 1ee2a92e..1ee2a92e 100644
--- a/tests/auto/customization/data/styles/identified/qmldir
+++ b/tests/auto/quickcontrols2/customization/data/styles/identified/qmldir
diff --git a/tests/auto/customization/data/styles/incomplete/AbstractButton.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/AbstractButton.qml
index 7e371050..7e371050 100644
--- a/tests/auto/customization/data/styles/incomplete/AbstractButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/AbstractButton.qml
diff --git a/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ApplicationWindow.qml
index 8fbdd1a4..8fbdd1a4 100644
--- a/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ApplicationWindow.qml
diff --git a/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/BusyIndicator.qml
index b046163e..b046163e 100644
--- a/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/BusyIndicator.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Button.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Button.qml
index 7daa248c..7daa248c 100644
--- a/tests/auto/customization/data/styles/incomplete/Button.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Button.qml
diff --git a/tests/auto/customization/data/styles/incomplete/CheckBox.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckBox.qml
index 50bfa058..50bfa058 100644
--- a/tests/auto/customization/data/styles/incomplete/CheckBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckBox.qml
diff --git a/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckDelegate.qml
index 13c0e472..13c0e472 100644
--- a/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckDelegate.qml
diff --git a/tests/auto/customization/data/styles/incomplete/ComboBox.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ComboBox.qml
index b0ff6257..b0ff6257 100644
--- a/tests/auto/customization/data/styles/incomplete/ComboBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ComboBox.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Container.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Container.qml
index 0ad81bea..0ad81bea 100644
--- a/tests/auto/customization/data/styles/incomplete/Container.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Container.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Control.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Control.qml
index 6f07f5da..6f07f5da 100644
--- a/tests/auto/customization/data/styles/incomplete/Control.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Control.qml
diff --git a/tests/auto/customization/data/styles/incomplete/DelayButton.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/DelayButton.qml
index b6ab635b..b6ab635b 100644
--- a/tests/auto/customization/data/styles/incomplete/DelayButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/DelayButton.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Dial.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dial.qml
index 66600c63..66600c63 100644
--- a/tests/auto/customization/data/styles/incomplete/Dial.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dial.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Dialog.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dialog.qml
index d8ab999e..d8ab999e 100644
--- a/tests/auto/customization/data/styles/incomplete/Dialog.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dialog.qml
diff --git a/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/DialogButtonBox.qml
index d7f954be..d7f954be 100644
--- a/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/DialogButtonBox.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Drawer.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Drawer.qml
index 5dadbd77..5dadbd77 100644
--- a/tests/auto/customization/data/styles/incomplete/Drawer.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Drawer.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Frame.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Frame.qml
index e447b5c2..e447b5c2 100644
--- a/tests/auto/customization/data/styles/incomplete/Frame.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Frame.qml
diff --git a/tests/auto/customization/data/styles/incomplete/GroupBox.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/GroupBox.qml
index 3597f158..3597f158 100644
--- a/tests/auto/customization/data/styles/incomplete/GroupBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/GroupBox.qml
diff --git a/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ItemDelegate.qml
index 79334dcb..79334dcb 100644
--- a/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ItemDelegate.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Label.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Label.qml
index e60ea00c..e60ea00c 100644
--- a/tests/auto/customization/data/styles/incomplete/Label.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Label.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Menu.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Menu.qml
index 220d0038..220d0038 100644
--- a/tests/auto/customization/data/styles/incomplete/Menu.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Menu.qml
diff --git a/tests/auto/customization/data/styles/incomplete/MenuBar.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBar.qml
index b782eb4d..b782eb4d 100644
--- a/tests/auto/customization/data/styles/incomplete/MenuBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBar.qml
diff --git a/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBarItem.qml
index a979ecb7..a979ecb7 100644
--- a/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBarItem.qml
diff --git a/tests/auto/customization/data/styles/incomplete/MenuItem.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuItem.qml
index b14f9089..b14f9089 100644
--- a/tests/auto/customization/data/styles/incomplete/MenuItem.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuItem.qml
diff --git a/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuSeparator.qml
index ba6d27ec..ba6d27ec 100644
--- a/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuSeparator.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Page.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Page.qml
index dbd29521..dbd29521 100644
--- a/tests/auto/customization/data/styles/incomplete/Page.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Page.qml
diff --git a/tests/auto/customization/data/styles/incomplete/PageIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/PageIndicator.qml
index b1836340..b1836340 100644
--- a/tests/auto/customization/data/styles/incomplete/PageIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/PageIndicator.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Pane.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Pane.qml
index ecd7cbdf..ecd7cbdf 100644
--- a/tests/auto/customization/data/styles/incomplete/Pane.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Pane.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Popup.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Popup.qml
index a3d7d8d5..a3d7d8d5 100644
--- a/tests/auto/customization/data/styles/incomplete/Popup.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Popup.qml
diff --git a/tests/auto/customization/data/styles/incomplete/ProgressBar.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ProgressBar.qml
index 293fe254..293fe254 100644
--- a/tests/auto/customization/data/styles/incomplete/ProgressBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ProgressBar.qml
diff --git a/tests/auto/customization/data/styles/incomplete/RadioButton.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioButton.qml
index f17729f7..f17729f7 100644
--- a/tests/auto/customization/data/styles/incomplete/RadioButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioButton.qml
diff --git a/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioDelegate.qml
index 8dd08aea..8dd08aea 100644
--- a/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioDelegate.qml
diff --git a/tests/auto/customization/data/styles/incomplete/RangeSlider.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/RangeSlider.qml
index 3a6ba580..3a6ba580 100644
--- a/tests/auto/customization/data/styles/incomplete/RangeSlider.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/RangeSlider.qml
diff --git a/tests/auto/customization/data/styles/incomplete/RoundButton.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/RoundButton.qml
index d51ef732..d51ef732 100644
--- a/tests/auto/customization/data/styles/incomplete/RoundButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/RoundButton.qml
diff --git a/tests/auto/customization/data/styles/incomplete/ScrollBar.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollBar.qml
index 906a9847..906a9847 100644
--- a/tests/auto/customization/data/styles/incomplete/ScrollBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollBar.qml
diff --git a/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollIndicator.qml
index b34d4097..b34d4097 100644
--- a/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollIndicator.qml
diff --git a/tests/auto/customization/data/styles/incomplete/ScrollView.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollView.qml
index a120e05f..a120e05f 100644
--- a/tests/auto/customization/data/styles/incomplete/ScrollView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollView.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Slider.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Slider.qml
index 02b06d92..02b06d92 100644
--- a/tests/auto/customization/data/styles/incomplete/Slider.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Slider.qml
diff --git a/tests/auto/customization/data/styles/incomplete/SpinBox.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/SpinBox.qml
index 9ec62e01..9ec62e01 100644
--- a/tests/auto/customization/data/styles/incomplete/SpinBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/SpinBox.qml
diff --git a/tests/auto/customization/data/styles/incomplete/StackView.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/StackView.qml
index 4108e166..4108e166 100644
--- a/tests/auto/customization/data/styles/incomplete/StackView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/StackView.qml
diff --git a/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeDelegate.qml
index 0da62d0f..0da62d0f 100644
--- a/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeDelegate.qml
diff --git a/tests/auto/customization/data/styles/incomplete/SwipeView.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeView.qml
index 434f9003..434f9003 100644
--- a/tests/auto/customization/data/styles/incomplete/SwipeView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeView.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Switch.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Switch.qml
index 9f24763f..9f24763f 100644
--- a/tests/auto/customization/data/styles/incomplete/Switch.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Switch.qml
diff --git a/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwitchDelegate.qml
index a33809c7..a33809c7 100644
--- a/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwitchDelegate.qml
diff --git a/tests/auto/customization/data/styles/incomplete/TabBar.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabBar.qml
index 68e4f627..68e4f627 100644
--- a/tests/auto/customization/data/styles/incomplete/TabBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabBar.qml
diff --git a/tests/auto/customization/data/styles/incomplete/TabButton.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabButton.qml
index 9ab619a9..9ab619a9 100644
--- a/tests/auto/customization/data/styles/incomplete/TabButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabButton.qml
diff --git a/tests/auto/customization/data/styles/incomplete/TextArea.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextArea.qml
index 42f3d2fd..42f3d2fd 100644
--- a/tests/auto/customization/data/styles/incomplete/TextArea.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextArea.qml
diff --git a/tests/auto/customization/data/styles/incomplete/TextField.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextField.qml
index 001d86b1..001d86b1 100644
--- a/tests/auto/customization/data/styles/incomplete/TextField.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextField.qml
diff --git a/tests/auto/customization/data/styles/incomplete/ToolBar.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolBar.qml
index de0bdb39..de0bdb39 100644
--- a/tests/auto/customization/data/styles/incomplete/ToolBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolBar.qml
diff --git a/tests/auto/customization/data/styles/incomplete/ToolButton.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolButton.qml
index 12b55b15..12b55b15 100644
--- a/tests/auto/customization/data/styles/incomplete/ToolButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolButton.qml
diff --git a/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolSeparator.qml
index aa413dd0..aa413dd0 100644
--- a/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolSeparator.qml
diff --git a/tests/auto/customization/data/styles/incomplete/ToolTip.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolTip.qml
index d2104f9e..d2104f9e 100644
--- a/tests/auto/customization/data/styles/incomplete/ToolTip.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolTip.qml
diff --git a/tests/auto/customization/data/styles/incomplete/Tumbler.qml b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Tumbler.qml
index 996af0d2..996af0d2 100644
--- a/tests/auto/customization/data/styles/incomplete/Tumbler.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/Tumbler.qml
diff --git a/tests/auto/customization/data/styles/incomplete/qmldir b/tests/auto/quickcontrols2/customization/data/styles/incomplete/qmldir
index e8813bd5..e8813bd5 100644
--- a/tests/auto/customization/data/styles/incomplete/qmldir
+++ b/tests/auto/quickcontrols2/customization/data/styles/incomplete/qmldir
diff --git a/tests/auto/customization/data/styles/override/AbstractButton.qml b/tests/auto/quickcontrols2/customization/data/styles/override/AbstractButton.qml
index e8bf0b90..e8bf0b90 100644
--- a/tests/auto/customization/data/styles/override/AbstractButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/AbstractButton.qml
diff --git a/tests/auto/customization/data/styles/override/ApplicationWindow.qml b/tests/auto/quickcontrols2/customization/data/styles/override/ApplicationWindow.qml
index 43b94010..43b94010 100644
--- a/tests/auto/customization/data/styles/override/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/ApplicationWindow.qml
diff --git a/tests/auto/customization/data/styles/override/BusyIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/override/BusyIndicator.qml
index 12418ff7..12418ff7 100644
--- a/tests/auto/customization/data/styles/override/BusyIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/BusyIndicator.qml
diff --git a/tests/auto/customization/data/styles/override/Button.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Button.qml
index 692c2fda..692c2fda 100644
--- a/tests/auto/customization/data/styles/override/Button.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Button.qml
diff --git a/tests/auto/customization/data/styles/override/CheckBox.qml b/tests/auto/quickcontrols2/customization/data/styles/override/CheckBox.qml
index 9830931b..9830931b 100644
--- a/tests/auto/customization/data/styles/override/CheckBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/CheckBox.qml
diff --git a/tests/auto/customization/data/styles/override/CheckDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/override/CheckDelegate.qml
index 77cdf23d..77cdf23d 100644
--- a/tests/auto/customization/data/styles/override/CheckDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/CheckDelegate.qml
diff --git a/tests/auto/customization/data/styles/override/ComboBox.qml b/tests/auto/quickcontrols2/customization/data/styles/override/ComboBox.qml
index c3276dcc..c3276dcc 100644
--- a/tests/auto/customization/data/styles/override/ComboBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/ComboBox.qml
diff --git a/tests/auto/customization/data/styles/override/Container.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Container.qml
index b732aefa..b732aefa 100644
--- a/tests/auto/customization/data/styles/override/Container.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Container.qml
diff --git a/tests/auto/customization/data/styles/override/Control.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Control.qml
index b4fefcf5..b4fefcf5 100644
--- a/tests/auto/customization/data/styles/override/Control.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Control.qml
diff --git a/tests/auto/customization/data/styles/override/DelayButton.qml b/tests/auto/quickcontrols2/customization/data/styles/override/DelayButton.qml
index 5ee03d57..5ee03d57 100644
--- a/tests/auto/customization/data/styles/override/DelayButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/DelayButton.qml
diff --git a/tests/auto/customization/data/styles/override/Dial.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Dial.qml
index d452a58f..d452a58f 100644
--- a/tests/auto/customization/data/styles/override/Dial.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Dial.qml
diff --git a/tests/auto/customization/data/styles/override/Dialog.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Dialog.qml
index 29e3d26d..29e3d26d 100644
--- a/tests/auto/customization/data/styles/override/Dialog.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Dialog.qml
diff --git a/tests/auto/customization/data/styles/override/DialogButtonBox.qml b/tests/auto/quickcontrols2/customization/data/styles/override/DialogButtonBox.qml
index c79b9f81..c79b9f81 100644
--- a/tests/auto/customization/data/styles/override/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/DialogButtonBox.qml
diff --git a/tests/auto/customization/data/styles/override/Drawer.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Drawer.qml
index 65aa625c..65aa625c 100644
--- a/tests/auto/customization/data/styles/override/Drawer.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Drawer.qml
diff --git a/tests/auto/customization/data/styles/override/Frame.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Frame.qml
index b31b70aa..b31b70aa 100644
--- a/tests/auto/customization/data/styles/override/Frame.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Frame.qml
diff --git a/tests/auto/customization/data/styles/override/GroupBox.qml b/tests/auto/quickcontrols2/customization/data/styles/override/GroupBox.qml
index 0d0bfbd9..0d0bfbd9 100644
--- a/tests/auto/customization/data/styles/override/GroupBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/GroupBox.qml
diff --git a/tests/auto/customization/data/styles/override/ItemDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/override/ItemDelegate.qml
index 4a087c75..4a087c75 100644
--- a/tests/auto/customization/data/styles/override/ItemDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/ItemDelegate.qml
diff --git a/tests/auto/customization/data/styles/override/Label.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Label.qml
index 883cff74..883cff74 100644
--- a/tests/auto/customization/data/styles/override/Label.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Label.qml
diff --git a/tests/auto/customization/data/styles/override/Menu.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Menu.qml
index f551fae8..f551fae8 100644
--- a/tests/auto/customization/data/styles/override/Menu.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Menu.qml
diff --git a/tests/auto/customization/data/styles/override/MenuBar.qml b/tests/auto/quickcontrols2/customization/data/styles/override/MenuBar.qml
index b7f54cfb..b7f54cfb 100644
--- a/tests/auto/customization/data/styles/override/MenuBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/MenuBar.qml
diff --git a/tests/auto/customization/data/styles/override/MenuBarItem.qml b/tests/auto/quickcontrols2/customization/data/styles/override/MenuBarItem.qml
index 513b59ce..513b59ce 100644
--- a/tests/auto/customization/data/styles/override/MenuBarItem.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/MenuBarItem.qml
diff --git a/tests/auto/customization/data/styles/override/MenuItem.qml b/tests/auto/quickcontrols2/customization/data/styles/override/MenuItem.qml
index 7f7f569a..7f7f569a 100644
--- a/tests/auto/customization/data/styles/override/MenuItem.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/MenuItem.qml
diff --git a/tests/auto/customization/data/styles/override/MenuSeparator.qml b/tests/auto/quickcontrols2/customization/data/styles/override/MenuSeparator.qml
index 57a2db15..57a2db15 100644
--- a/tests/auto/customization/data/styles/override/MenuSeparator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/MenuSeparator.qml
diff --git a/tests/auto/customization/data/styles/override/Page.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Page.qml
index c51d1e73..c51d1e73 100644
--- a/tests/auto/customization/data/styles/override/Page.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Page.qml
diff --git a/tests/auto/customization/data/styles/override/PageIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/override/PageIndicator.qml
index 3d58299e..3d58299e 100644
--- a/tests/auto/customization/data/styles/override/PageIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/PageIndicator.qml
diff --git a/tests/auto/customization/data/styles/override/Pane.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Pane.qml
index 70a29441..70a29441 100644
--- a/tests/auto/customization/data/styles/override/Pane.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Pane.qml
diff --git a/tests/auto/customization/data/styles/override/Popup.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Popup.qml
index a63879bd..a63879bd 100644
--- a/tests/auto/customization/data/styles/override/Popup.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Popup.qml
diff --git a/tests/auto/customization/data/styles/override/ProgressBar.qml b/tests/auto/quickcontrols2/customization/data/styles/override/ProgressBar.qml
index 2a9e636a..2a9e636a 100644
--- a/tests/auto/customization/data/styles/override/ProgressBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/ProgressBar.qml
diff --git a/tests/auto/customization/data/styles/override/RadioButton.qml b/tests/auto/quickcontrols2/customization/data/styles/override/RadioButton.qml
index 5bd5c721..5bd5c721 100644
--- a/tests/auto/customization/data/styles/override/RadioButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/RadioButton.qml
diff --git a/tests/auto/customization/data/styles/override/RadioDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/override/RadioDelegate.qml
index 7fbe3833..7fbe3833 100644
--- a/tests/auto/customization/data/styles/override/RadioDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/RadioDelegate.qml
diff --git a/tests/auto/customization/data/styles/override/RangeSlider.qml b/tests/auto/quickcontrols2/customization/data/styles/override/RangeSlider.qml
index 0f4cda99..0f4cda99 100644
--- a/tests/auto/customization/data/styles/override/RangeSlider.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/RangeSlider.qml
diff --git a/tests/auto/customization/data/styles/override/RoundButton.qml b/tests/auto/quickcontrols2/customization/data/styles/override/RoundButton.qml
index 1a0b0e05..1a0b0e05 100644
--- a/tests/auto/customization/data/styles/override/RoundButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/RoundButton.qml
diff --git a/tests/auto/customization/data/styles/override/ScrollBar.qml b/tests/auto/quickcontrols2/customization/data/styles/override/ScrollBar.qml
index fc551710..fc551710 100644
--- a/tests/auto/customization/data/styles/override/ScrollBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/ScrollBar.qml
diff --git a/tests/auto/customization/data/styles/override/ScrollIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/override/ScrollIndicator.qml
index 06497abb..06497abb 100644
--- a/tests/auto/customization/data/styles/override/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/ScrollIndicator.qml
diff --git a/tests/auto/customization/data/styles/override/ScrollView.qml b/tests/auto/quickcontrols2/customization/data/styles/override/ScrollView.qml
index bc02c265..bc02c265 100644
--- a/tests/auto/customization/data/styles/override/ScrollView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/ScrollView.qml
diff --git a/tests/auto/customization/data/styles/override/Slider.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Slider.qml
index 052c523b..052c523b 100644
--- a/tests/auto/customization/data/styles/override/Slider.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Slider.qml
diff --git a/tests/auto/customization/data/styles/override/SpinBox.qml b/tests/auto/quickcontrols2/customization/data/styles/override/SpinBox.qml
index d074ec63..d074ec63 100644
--- a/tests/auto/customization/data/styles/override/SpinBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/SpinBox.qml
diff --git a/tests/auto/customization/data/styles/override/StackView.qml b/tests/auto/quickcontrols2/customization/data/styles/override/StackView.qml
index bc33d64b..bc33d64b 100644
--- a/tests/auto/customization/data/styles/override/StackView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/StackView.qml
diff --git a/tests/auto/customization/data/styles/override/SwipeDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/override/SwipeDelegate.qml
index bb387370..bb387370 100644
--- a/tests/auto/customization/data/styles/override/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/SwipeDelegate.qml
diff --git a/tests/auto/customization/data/styles/override/SwipeView.qml b/tests/auto/quickcontrols2/customization/data/styles/override/SwipeView.qml
index 63646a0b..63646a0b 100644
--- a/tests/auto/customization/data/styles/override/SwipeView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/SwipeView.qml
diff --git a/tests/auto/customization/data/styles/override/Switch.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Switch.qml
index 57a3f804..57a3f804 100644
--- a/tests/auto/customization/data/styles/override/Switch.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Switch.qml
diff --git a/tests/auto/customization/data/styles/override/SwitchDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/override/SwitchDelegate.qml
index 6b9986d8..6b9986d8 100644
--- a/tests/auto/customization/data/styles/override/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/SwitchDelegate.qml
diff --git a/tests/auto/customization/data/styles/override/TabBar.qml b/tests/auto/quickcontrols2/customization/data/styles/override/TabBar.qml
index b3e03bdd..b3e03bdd 100644
--- a/tests/auto/customization/data/styles/override/TabBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/TabBar.qml
diff --git a/tests/auto/customization/data/styles/override/TabButton.qml b/tests/auto/quickcontrols2/customization/data/styles/override/TabButton.qml
index f2852f68..f2852f68 100644
--- a/tests/auto/customization/data/styles/override/TabButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/TabButton.qml
diff --git a/tests/auto/customization/data/styles/override/TextArea.qml b/tests/auto/quickcontrols2/customization/data/styles/override/TextArea.qml
index ad4a3c7b..ad4a3c7b 100644
--- a/tests/auto/customization/data/styles/override/TextArea.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/TextArea.qml
diff --git a/tests/auto/customization/data/styles/override/TextField.qml b/tests/auto/quickcontrols2/customization/data/styles/override/TextField.qml
index 39bb695e..39bb695e 100644
--- a/tests/auto/customization/data/styles/override/TextField.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/TextField.qml
diff --git a/tests/auto/customization/data/styles/override/ToolBar.qml b/tests/auto/quickcontrols2/customization/data/styles/override/ToolBar.qml
index 8af7238e..8af7238e 100644
--- a/tests/auto/customization/data/styles/override/ToolBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/ToolBar.qml
diff --git a/tests/auto/customization/data/styles/override/ToolButton.qml b/tests/auto/quickcontrols2/customization/data/styles/override/ToolButton.qml
index a9e285fb..a9e285fb 100644
--- a/tests/auto/customization/data/styles/override/ToolButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/ToolButton.qml
diff --git a/tests/auto/customization/data/styles/override/ToolSeparator.qml b/tests/auto/quickcontrols2/customization/data/styles/override/ToolSeparator.qml
index 5c6b408d..5c6b408d 100644
--- a/tests/auto/customization/data/styles/override/ToolSeparator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/ToolSeparator.qml
diff --git a/tests/auto/customization/data/styles/override/ToolTip.qml b/tests/auto/quickcontrols2/customization/data/styles/override/ToolTip.qml
index 642d6184..642d6184 100644
--- a/tests/auto/customization/data/styles/override/ToolTip.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/ToolTip.qml
diff --git a/tests/auto/customization/data/styles/override/Tumbler.qml b/tests/auto/quickcontrols2/customization/data/styles/override/Tumbler.qml
index 72d68f8a..72d68f8a 100644
--- a/tests/auto/customization/data/styles/override/Tumbler.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/Tumbler.qml
diff --git a/tests/auto/customization/data/styles/override/qmldir b/tests/auto/quickcontrols2/customization/data/styles/override/qmldir
index f15ba96a..f15ba96a 100644
--- a/tests/auto/customization/data/styles/override/qmldir
+++ b/tests/auto/quickcontrols2/customization/data/styles/override/qmldir
diff --git a/tests/auto/customization/data/styles/simple/AbstractButton.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/AbstractButton.qml
index f8eaef0c..f8eaef0c 100644
--- a/tests/auto/customization/data/styles/simple/AbstractButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/AbstractButton.qml
diff --git a/tests/auto/customization/data/styles/simple/ApplicationWindow.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/ApplicationWindow.qml
index ec39193b..ec39193b 100644
--- a/tests/auto/customization/data/styles/simple/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/ApplicationWindow.qml
diff --git a/tests/auto/customization/data/styles/simple/BusyIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/BusyIndicator.qml
index 1dcebb9b..1dcebb9b 100644
--- a/tests/auto/customization/data/styles/simple/BusyIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/BusyIndicator.qml
diff --git a/tests/auto/customization/data/styles/simple/Button.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Button.qml
index 993c585b..993c585b 100644
--- a/tests/auto/customization/data/styles/simple/Button.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Button.qml
diff --git a/tests/auto/customization/data/styles/simple/CheckBox.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/CheckBox.qml
index f4a95f0f..f4a95f0f 100644
--- a/tests/auto/customization/data/styles/simple/CheckBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/CheckBox.qml
diff --git a/tests/auto/customization/data/styles/simple/CheckDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/CheckDelegate.qml
index 563db329..563db329 100644
--- a/tests/auto/customization/data/styles/simple/CheckDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/CheckDelegate.qml
diff --git a/tests/auto/customization/data/styles/simple/ComboBox.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/ComboBox.qml
index ed861389..ed861389 100644
--- a/tests/auto/customization/data/styles/simple/ComboBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/ComboBox.qml
diff --git a/tests/auto/customization/data/styles/simple/Container.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Container.qml
index 4a150096..4a150096 100644
--- a/tests/auto/customization/data/styles/simple/Container.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Container.qml
diff --git a/tests/auto/customization/data/styles/simple/Control.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Control.qml
index e083f8ac..e083f8ac 100644
--- a/tests/auto/customization/data/styles/simple/Control.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Control.qml
diff --git a/tests/auto/customization/data/styles/simple/DelayButton.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/DelayButton.qml
index 8f33c401..8f33c401 100644
--- a/tests/auto/customization/data/styles/simple/DelayButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/DelayButton.qml
diff --git a/tests/auto/customization/data/styles/simple/Dial.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Dial.qml
index c1a9b50b..c1a9b50b 100644
--- a/tests/auto/customization/data/styles/simple/Dial.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Dial.qml
diff --git a/tests/auto/customization/data/styles/simple/Dialog.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Dialog.qml
index 787acca9..787acca9 100644
--- a/tests/auto/customization/data/styles/simple/Dialog.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Dialog.qml
diff --git a/tests/auto/customization/data/styles/simple/DialogButtonBox.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/DialogButtonBox.qml
index d7da32e0..d7da32e0 100644
--- a/tests/auto/customization/data/styles/simple/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/DialogButtonBox.qml
diff --git a/tests/auto/customization/data/styles/simple/Drawer.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Drawer.qml
index 8239b1af..8239b1af 100644
--- a/tests/auto/customization/data/styles/simple/Drawer.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Drawer.qml
diff --git a/tests/auto/customization/data/styles/simple/Frame.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Frame.qml
index cbeb3c5d..cbeb3c5d 100644
--- a/tests/auto/customization/data/styles/simple/Frame.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Frame.qml
diff --git a/tests/auto/customization/data/styles/simple/GroupBox.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/GroupBox.qml
index 14dc3341..14dc3341 100644
--- a/tests/auto/customization/data/styles/simple/GroupBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/GroupBox.qml
diff --git a/tests/auto/customization/data/styles/simple/ItemDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/ItemDelegate.qml
index a22ec3aa..a22ec3aa 100644
--- a/tests/auto/customization/data/styles/simple/ItemDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/ItemDelegate.qml
diff --git a/tests/auto/customization/data/styles/simple/Label.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Label.qml
index 80b34723..80b34723 100644
--- a/tests/auto/customization/data/styles/simple/Label.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Label.qml
diff --git a/tests/auto/customization/data/styles/simple/Menu.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Menu.qml
index 7538bd5b..7538bd5b 100644
--- a/tests/auto/customization/data/styles/simple/Menu.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Menu.qml
diff --git a/tests/auto/customization/data/styles/simple/MenuBar.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBar.qml
index a38c876e..a38c876e 100644
--- a/tests/auto/customization/data/styles/simple/MenuBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBar.qml
diff --git a/tests/auto/customization/data/styles/simple/MenuBarItem.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBarItem.qml
index de9dc929..de9dc929 100644
--- a/tests/auto/customization/data/styles/simple/MenuBarItem.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBarItem.qml
diff --git a/tests/auto/customization/data/styles/simple/MenuItem.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/MenuItem.qml
index 28d5998b..28d5998b 100644
--- a/tests/auto/customization/data/styles/simple/MenuItem.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/MenuItem.qml
diff --git a/tests/auto/customization/data/styles/simple/MenuSeparator.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/MenuSeparator.qml
index 3df17b58..3df17b58 100644
--- a/tests/auto/customization/data/styles/simple/MenuSeparator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/MenuSeparator.qml
diff --git a/tests/auto/customization/data/styles/simple/Page.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Page.qml
index 51ec6063..51ec6063 100644
--- a/tests/auto/customization/data/styles/simple/Page.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Page.qml
diff --git a/tests/auto/customization/data/styles/simple/PageIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/PageIndicator.qml
index d508687f..d508687f 100644
--- a/tests/auto/customization/data/styles/simple/PageIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/PageIndicator.qml
diff --git a/tests/auto/customization/data/styles/simple/Pane.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Pane.qml
index 3b9e12b8..3b9e12b8 100644
--- a/tests/auto/customization/data/styles/simple/Pane.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Pane.qml
diff --git a/tests/auto/customization/data/styles/simple/Popup.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Popup.qml
index 8b62fcad..8b62fcad 100644
--- a/tests/auto/customization/data/styles/simple/Popup.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Popup.qml
diff --git a/tests/auto/customization/data/styles/simple/ProgressBar.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/ProgressBar.qml
index 3f04e6b2..3f04e6b2 100644
--- a/tests/auto/customization/data/styles/simple/ProgressBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/ProgressBar.qml
diff --git a/tests/auto/customization/data/styles/simple/RadioButton.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/RadioButton.qml
index 7ca5973b..7ca5973b 100644
--- a/tests/auto/customization/data/styles/simple/RadioButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/RadioButton.qml
diff --git a/tests/auto/customization/data/styles/simple/RadioDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/RadioDelegate.qml
index bc96ad47..bc96ad47 100644
--- a/tests/auto/customization/data/styles/simple/RadioDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/RadioDelegate.qml
diff --git a/tests/auto/customization/data/styles/simple/RangeSlider.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/RangeSlider.qml
index 202688c4..202688c4 100644
--- a/tests/auto/customization/data/styles/simple/RangeSlider.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/RangeSlider.qml
diff --git a/tests/auto/customization/data/styles/simple/RoundButton.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/RoundButton.qml
index 3547239f..3547239f 100644
--- a/tests/auto/customization/data/styles/simple/RoundButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/RoundButton.qml
diff --git a/tests/auto/customization/data/styles/simple/ScrollBar.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollBar.qml
index 25bc3e09..25bc3e09 100644
--- a/tests/auto/customization/data/styles/simple/ScrollBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollBar.qml
diff --git a/tests/auto/customization/data/styles/simple/ScrollIndicator.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollIndicator.qml
index a901671b..a901671b 100644
--- a/tests/auto/customization/data/styles/simple/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollIndicator.qml
diff --git a/tests/auto/customization/data/styles/simple/ScrollView.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollView.qml
index 56334d84..56334d84 100644
--- a/tests/auto/customization/data/styles/simple/ScrollView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollView.qml
diff --git a/tests/auto/customization/data/styles/simple/Slider.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Slider.qml
index d5417404..d5417404 100644
--- a/tests/auto/customization/data/styles/simple/Slider.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Slider.qml
diff --git a/tests/auto/customization/data/styles/simple/SpinBox.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/SpinBox.qml
index 0facffad..0facffad 100644
--- a/tests/auto/customization/data/styles/simple/SpinBox.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/SpinBox.qml
diff --git a/tests/auto/customization/data/styles/simple/StackView.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/StackView.qml
index e16b9938..e16b9938 100644
--- a/tests/auto/customization/data/styles/simple/StackView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/StackView.qml
diff --git a/tests/auto/customization/data/styles/simple/SwipeDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeDelegate.qml
index fec9f120..fec9f120 100644
--- a/tests/auto/customization/data/styles/simple/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeDelegate.qml
diff --git a/tests/auto/customization/data/styles/simple/SwipeView.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeView.qml
index cf154b6b..cf154b6b 100644
--- a/tests/auto/customization/data/styles/simple/SwipeView.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeView.qml
diff --git a/tests/auto/customization/data/styles/simple/Switch.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Switch.qml
index 9e961308..9e961308 100644
--- a/tests/auto/customization/data/styles/simple/Switch.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Switch.qml
diff --git a/tests/auto/customization/data/styles/simple/SwitchDelegate.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/SwitchDelegate.qml
index f7eb1d5c..f7eb1d5c 100644
--- a/tests/auto/customization/data/styles/simple/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/SwitchDelegate.qml
diff --git a/tests/auto/customization/data/styles/simple/TabBar.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/TabBar.qml
index 6b0f2b63..6b0f2b63 100644
--- a/tests/auto/customization/data/styles/simple/TabBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/TabBar.qml
diff --git a/tests/auto/customization/data/styles/simple/TabButton.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/TabButton.qml
index 4c8a30ba..4c8a30ba 100644
--- a/tests/auto/customization/data/styles/simple/TabButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/TabButton.qml
diff --git a/tests/auto/customization/data/styles/simple/TextArea.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/TextArea.qml
index 7e906433..7e906433 100644
--- a/tests/auto/customization/data/styles/simple/TextArea.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/TextArea.qml
diff --git a/tests/auto/customization/data/styles/simple/TextField.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/TextField.qml
index 71a68534..71a68534 100644
--- a/tests/auto/customization/data/styles/simple/TextField.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/TextField.qml
diff --git a/tests/auto/customization/data/styles/simple/ToolBar.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/ToolBar.qml
index 30bba195..30bba195 100644
--- a/tests/auto/customization/data/styles/simple/ToolBar.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/ToolBar.qml
diff --git a/tests/auto/customization/data/styles/simple/ToolButton.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/ToolButton.qml
index 229b7536..229b7536 100644
--- a/tests/auto/customization/data/styles/simple/ToolButton.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/ToolButton.qml
diff --git a/tests/auto/customization/data/styles/simple/ToolSeparator.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/ToolSeparator.qml
index 8ee00bc3..8ee00bc3 100644
--- a/tests/auto/customization/data/styles/simple/ToolSeparator.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/ToolSeparator.qml
diff --git a/tests/auto/customization/data/styles/simple/ToolTip.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/ToolTip.qml
index 0299adf1..0299adf1 100644
--- a/tests/auto/customization/data/styles/simple/ToolTip.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/ToolTip.qml
diff --git a/tests/auto/customization/data/styles/simple/Tumbler.qml b/tests/auto/quickcontrols2/customization/data/styles/simple/Tumbler.qml
index 34f423c7..34f423c7 100644
--- a/tests/auto/customization/data/styles/simple/Tumbler.qml
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/Tumbler.qml
diff --git a/tests/auto/customization/data/styles/simple/qmldir b/tests/auto/quickcontrols2/customization/data/styles/simple/qmldir
index e5159885..e5159885 100644
--- a/tests/auto/customization/data/styles/simple/qmldir
+++ b/tests/auto/quickcontrols2/customization/data/styles/simple/qmldir
diff --git a/tests/auto/customization/tst_customization.cpp b/tests/auto/quickcontrols2/customization/tst_customization.cpp
index 02c75978..02c75978 100644
--- a/tests/auto/customization/tst_customization.cpp
+++ b/tests/auto/quickcontrols2/customization/tst_customization.cpp
diff --git a/tests/auto/designer/CMakeLists.txt b/tests/auto/quickcontrols2/designer/CMakeLists.txt
index 50331f8f..50331f8f 100644
--- a/tests/auto/designer/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/designer/CMakeLists.txt
diff --git a/tests/auto/designer/tst_designer.cpp b/tests/auto/quickcontrols2/designer/tst_designer.cpp
index 0f6598a6..0f6598a6 100644
--- a/tests/auto/designer/tst_designer.cpp
+++ b/tests/auto/quickcontrols2/designer/tst_designer.cpp
diff --git a/tests/auto/dialogs/CMakeLists.txt b/tests/auto/quickcontrols2/dialogs/CMakeLists.txt
index 94485f87..94485f87 100644
--- a/tests/auto/dialogs/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/dialogs/CMakeLists.txt
diff --git a/tests/auto/dialogs/dialogs.pro b/tests/auto/quickcontrols2/dialogs/dialogs.pro
index 004641ec..004641ec 100644
--- a/tests/auto/dialogs/dialogs.pro
+++ b/tests/auto/quickcontrols2/dialogs/dialogs.pro
diff --git a/tests/auto/dialogs/qquickfiledialogimpl/BLACKLIST b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/BLACKLIST
index 822b92dd..822b92dd 100644
--- a/tests/auto/dialogs/qquickfiledialogimpl/BLACKLIST
+++ b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/BLACKLIST
diff --git a/tests/auto/dialogs/qquickfiledialogimpl/CMakeLists.txt b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/CMakeLists.txt
index 22e64546..22e64546 100644
--- a/tests/auto/dialogs/qquickfiledialogimpl/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/CMakeLists.txt
diff --git a/tests/auto/dialogs/qquickfiledialogimpl/data/acceptRejectLabel.qml b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/acceptRejectLabel.qml
index 3cd526e3..3cd526e3 100644
--- a/tests/auto/dialogs/qquickfiledialogimpl/data/acceptRejectLabel.qml
+++ b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/acceptRejectLabel.qml
diff --git a/tests/auto/dialogs/qquickfiledialogimpl/data/bindAllTxtHtmlNameFilters.qml b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/bindAllTxtHtmlNameFilters.qml
index 5010c422..5010c422 100644
--- a/tests/auto/dialogs/qquickfiledialogimpl/data/bindAllTxtHtmlNameFilters.qml
+++ b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/bindAllTxtHtmlNameFilters.qml
diff --git a/tests/auto/dialogs/qquickfiledialogimpl/data/bindCurrentFolder.qml b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/bindCurrentFolder.qml
index 03cd61bc..03cd61bc 100644
--- a/tests/auto/dialogs/qquickfiledialogimpl/data/bindCurrentFolder.qml
+++ b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/bindCurrentFolder.qml
diff --git a/tests/auto/dialogs/qquickfiledialogimpl/data/bindTitle.qml b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/bindTitle.qml
index 60657f58..60657f58 100644
--- a/tests/auto/dialogs/qquickfiledialogimpl/data/bindTitle.qml
+++ b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/bindTitle.qml
diff --git a/tests/auto/dialogs/qquickfiledialogimpl/data/bindTxtHtmlNameFilters.qml b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/bindTxtHtmlNameFilters.qml
index 1e312fbc..1e312fbc 100644
--- a/tests/auto/dialogs/qquickfiledialogimpl/data/bindTxtHtmlNameFilters.qml
+++ b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/bindTxtHtmlNameFilters.qml
diff --git a/tests/auto/dialogs/qquickfiledialogimpl/data/fileDialog.qml b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/fileDialog.qml
index febad45c..febad45c 100644
--- a/tests/auto/dialogs/qquickfiledialogimpl/data/fileDialog.qml
+++ b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/data/fileDialog.qml
diff --git a/tests/auto/dialogs/qquickfiledialogimpl/qquickfiledialogimpl.pro b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/qquickfiledialogimpl.pro
index 3f6e83d7..3f6e83d7 100644
--- a/tests/auto/dialogs/qquickfiledialogimpl/qquickfiledialogimpl.pro
+++ b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/qquickfiledialogimpl.pro
diff --git a/tests/auto/dialogs/qquickfiledialogimpl/tst_qquickfiledialogimpl.cpp b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/tst_qquickfiledialogimpl.cpp
index a8fe4c15..a8fe4c15 100644
--- a/tests/auto/dialogs/qquickfiledialogimpl/tst_qquickfiledialogimpl.cpp
+++ b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/tst_qquickfiledialogimpl.cpp
diff --git a/tests/auto/dialogs/qquickfontdialogimpl/BLACKLIST b/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/BLACKLIST
index acabf6c5..acabf6c5 100644
--- a/tests/auto/dialogs/qquickfontdialogimpl/BLACKLIST
+++ b/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/BLACKLIST
diff --git a/tests/auto/dialogs/qquickfontdialogimpl/CMakeLists.txt b/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/CMakeLists.txt
index 0250c64e..0250c64e 100644
--- a/tests/auto/dialogs/qquickfontdialogimpl/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/CMakeLists.txt
diff --git a/tests/auto/dialogs/qquickfontdialogimpl/data/fontDialog.qml b/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/data/fontDialog.qml
index 4979d473..4979d473 100644
--- a/tests/auto/dialogs/qquickfontdialogimpl/data/fontDialog.qml
+++ b/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/data/fontDialog.qml
diff --git a/tests/auto/dialogs/qquickfontdialogimpl/tst_qquickfontdialogimpl.cpp b/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/tst_qquickfontdialogimpl.cpp
index 42f60f1b..42f60f1b 100644
--- a/tests/auto/dialogs/qquickfontdialogimpl/tst_qquickfontdialogimpl.cpp
+++ b/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/tst_qquickfontdialogimpl.cpp
diff --git a/tests/auto/focus/BLACKLIST b/tests/auto/quickcontrols2/focus/BLACKLIST
index 730d3844..730d3844 100644
--- a/tests/auto/focus/BLACKLIST
+++ b/tests/auto/quickcontrols2/focus/BLACKLIST
diff --git a/tests/auto/focus/CMakeLists.txt b/tests/auto/quickcontrols2/focus/CMakeLists.txt
index b9932df1..6ccf461b 100644
--- a/tests/auto/focus/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/focus/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_focus
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_focus.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/focus/data/activeFocusOnTab.qml b/tests/auto/quickcontrols2/focus/data/activeFocusOnTab.qml
index 6b57f39b..6b57f39b 100644
--- a/tests/auto/focus/data/activeFocusOnTab.qml
+++ b/tests/auto/quickcontrols2/focus/data/activeFocusOnTab.qml
diff --git a/tests/auto/focus/data/keyNavigation.qml b/tests/auto/quickcontrols2/focus/data/keyNavigation.qml
index 7ac8e014..7ac8e014 100644
--- a/tests/auto/focus/data/keyNavigation.qml
+++ b/tests/auto/quickcontrols2/focus/data/keyNavigation.qml
diff --git a/tests/auto/focus/data/visualFocus.qml b/tests/auto/quickcontrols2/focus/data/visualFocus.qml
index 2f516be7..2f516be7 100644
--- a/tests/auto/focus/data/visualFocus.qml
+++ b/tests/auto/quickcontrols2/focus/data/visualFocus.qml
diff --git a/tests/auto/focus/tst_focus.cpp b/tests/auto/quickcontrols2/focus/tst_focus.cpp
index 92df4665..92df4665 100644
--- a/tests/auto/focus/tst_focus.cpp
+++ b/tests/auto/quickcontrols2/focus/tst_focus.cpp
diff --git a/tests/auto/font/CMakeLists.txt b/tests/auto/quickcontrols2/font/CMakeLists.txt
index 2f356eee..219c6f6d 100644
--- a/tests/auto/font/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/font/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_font
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_font.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/font/data/font-appwindow-custom.qml b/tests/auto/quickcontrols2/font/data/font-appwindow-custom.qml
index 9f82079e..9f82079e 100644
--- a/tests/auto/font/data/font-appwindow-custom.qml
+++ b/tests/auto/quickcontrols2/font/data/font-appwindow-custom.qml
diff --git a/tests/auto/font/data/font-appwindow-default.qml b/tests/auto/quickcontrols2/font/data/font-appwindow-default.qml
index 9f2c34fe..9f2c34fe 100644
--- a/tests/auto/font/data/font-appwindow-default.qml
+++ b/tests/auto/quickcontrols2/font/data/font-appwindow-default.qml
diff --git a/tests/auto/font/data/font-control-custom.qml b/tests/auto/quickcontrols2/font/data/font-control-custom.qml
index 8fcfc686..8fcfc686 100644
--- a/tests/auto/font/data/font-control-custom.qml
+++ b/tests/auto/quickcontrols2/font/data/font-control-custom.qml
diff --git a/tests/auto/font/data/font-control-default.qml b/tests/auto/quickcontrols2/font/data/font-control-default.qml
index 48afa021..48afa021 100644
--- a/tests/auto/font/data/font-control-default.qml
+++ b/tests/auto/quickcontrols2/font/data/font-control-default.qml
diff --git a/tests/auto/font/data/font-popup-custom.qml b/tests/auto/quickcontrols2/font/data/font-popup-custom.qml
index e3983bf5..e3983bf5 100644
--- a/tests/auto/font/data/font-popup-custom.qml
+++ b/tests/auto/quickcontrols2/font/data/font-popup-custom.qml
diff --git a/tests/auto/font/data/font-popup-default.qml b/tests/auto/quickcontrols2/font/data/font-popup-default.qml
index 77676bac..77676bac 100644
--- a/tests/auto/font/data/font-popup-default.qml
+++ b/tests/auto/quickcontrols2/font/data/font-popup-default.qml
diff --git a/tests/auto/font/data/inheritance-childcontrol.qml b/tests/auto/quickcontrols2/font/data/inheritance-childcontrol.qml
index 896354df..896354df 100644
--- a/tests/auto/font/data/inheritance-childcontrol.qml
+++ b/tests/auto/quickcontrols2/font/data/inheritance-childcontrol.qml
diff --git a/tests/auto/font/data/inheritance-childpopup.qml b/tests/auto/quickcontrols2/font/data/inheritance-childpopup.qml
index 7896a558..7896a558 100644
--- a/tests/auto/font/data/inheritance-childpopup.qml
+++ b/tests/auto/quickcontrols2/font/data/inheritance-childpopup.qml
diff --git a/tests/auto/font/data/inheritance-control.qml b/tests/auto/quickcontrols2/font/data/inheritance-control.qml
index eb534180..eb534180 100644
--- a/tests/auto/font/data/inheritance-control.qml
+++ b/tests/auto/quickcontrols2/font/data/inheritance-control.qml
diff --git a/tests/auto/font/data/inheritance-dynamicchildcontrol.qml b/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildcontrol.qml
index 0a4e5bc6..0a4e5bc6 100644
--- a/tests/auto/font/data/inheritance-dynamicchildcontrol.qml
+++ b/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildcontrol.qml
diff --git a/tests/auto/font/data/inheritance-dynamicchildpopup.qml b/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildpopup.qml
index 0e799d47..0e799d47 100644
--- a/tests/auto/font/data/inheritance-dynamicchildpopup.qml
+++ b/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildpopup.qml
diff --git a/tests/auto/font/data/inheritance-dynamiccontrol.qml b/tests/auto/quickcontrols2/font/data/inheritance-dynamiccontrol.qml
index 058d5b8b..058d5b8b 100644
--- a/tests/auto/font/data/inheritance-dynamiccontrol.qml
+++ b/tests/auto/quickcontrols2/font/data/inheritance-dynamiccontrol.qml
diff --git a/tests/auto/font/data/inheritance-dynamicpopup.qml b/tests/auto/quickcontrols2/font/data/inheritance-dynamicpopup.qml
index 429669c7..429669c7 100644
--- a/tests/auto/font/data/inheritance-dynamicpopup.qml
+++ b/tests/auto/quickcontrols2/font/data/inheritance-dynamicpopup.qml
diff --git a/tests/auto/font/data/inheritance-popup.qml b/tests/auto/quickcontrols2/font/data/inheritance-popup.qml
index cd2aebb5..cd2aebb5 100644
--- a/tests/auto/font/data/inheritance-popup.qml
+++ b/tests/auto/quickcontrols2/font/data/inheritance-popup.qml
diff --git a/tests/auto/font/data/listview.qml b/tests/auto/quickcontrols2/font/data/listview.qml
index 7c372585..7c372585 100644
--- a/tests/auto/font/data/listview.qml
+++ b/tests/auto/quickcontrols2/font/data/listview.qml
diff --git a/tests/auto/font/tst_font.cpp b/tests/auto/quickcontrols2/font/tst_font.cpp
index 976658b5..976658b5 100644
--- a/tests/auto/font/tst_font.cpp
+++ b/tests/auto/quickcontrols2/font/tst_font.cpp
diff --git a/tests/auto/palette/CMakeLists.txt b/tests/auto/quickcontrols2/palette/CMakeLists.txt
index a924fd16..64aa3a1c 100644
--- a/tests/auto/palette/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/palette/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_palette
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_palette.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/palette/data/bindings.qml b/tests/auto/quickcontrols2/palette/data/bindings.qml
index 215fb034..215fb034 100644
--- a/tests/auto/palette/data/bindings.qml
+++ b/tests/auto/quickcontrols2/palette/data/bindings.qml
diff --git a/tests/auto/palette/data/inheritance-childcontrol.qml b/tests/auto/quickcontrols2/palette/data/inheritance-childcontrol.qml
index 896354df..896354df 100644
--- a/tests/auto/palette/data/inheritance-childcontrol.qml
+++ b/tests/auto/quickcontrols2/palette/data/inheritance-childcontrol.qml
diff --git a/tests/auto/palette/data/inheritance-childpopup.qml b/tests/auto/quickcontrols2/palette/data/inheritance-childpopup.qml
index 7896a558..7896a558 100644
--- a/tests/auto/palette/data/inheritance-childpopup.qml
+++ b/tests/auto/quickcontrols2/palette/data/inheritance-childpopup.qml
diff --git a/tests/auto/palette/data/inheritance-control.qml b/tests/auto/quickcontrols2/palette/data/inheritance-control.qml
index eb534180..eb534180 100644
--- a/tests/auto/palette/data/inheritance-control.qml
+++ b/tests/auto/quickcontrols2/palette/data/inheritance-control.qml
diff --git a/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml b/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildcontrol.qml
index 0a4e5bc6..0a4e5bc6 100644
--- a/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml
+++ b/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildcontrol.qml
diff --git a/tests/auto/palette/data/inheritance-dynamicchildpopup.qml b/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildpopup.qml
index 0e799d47..0e799d47 100644
--- a/tests/auto/palette/data/inheritance-dynamicchildpopup.qml
+++ b/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildpopup.qml
diff --git a/tests/auto/palette/data/inheritance-dynamiccontrol.qml b/tests/auto/quickcontrols2/palette/data/inheritance-dynamiccontrol.qml
index 058d5b8b..058d5b8b 100644
--- a/tests/auto/palette/data/inheritance-dynamiccontrol.qml
+++ b/tests/auto/quickcontrols2/palette/data/inheritance-dynamiccontrol.qml
diff --git a/tests/auto/palette/data/inheritance-dynamicpopup.qml b/tests/auto/quickcontrols2/palette/data/inheritance-dynamicpopup.qml
index 429669c7..429669c7 100644
--- a/tests/auto/palette/data/inheritance-dynamicpopup.qml
+++ b/tests/auto/quickcontrols2/palette/data/inheritance-dynamicpopup.qml
diff --git a/tests/auto/palette/data/inheritance-popup.qml b/tests/auto/quickcontrols2/palette/data/inheritance-popup.qml
index cd2aebb5..cd2aebb5 100644
--- a/tests/auto/palette/data/inheritance-popup.qml
+++ b/tests/auto/quickcontrols2/palette/data/inheritance-popup.qml
diff --git a/tests/auto/palette/data/listview.qml b/tests/auto/quickcontrols2/palette/data/listview.qml
index eee6531f..eee6531f 100644
--- a/tests/auto/palette/data/listview.qml
+++ b/tests/auto/quickcontrols2/palette/data/listview.qml
diff --git a/tests/auto/palette/data/palette-appwindow-custom.qml b/tests/auto/quickcontrols2/palette/data/palette-appwindow-custom.qml
index 95f9fde6..95f9fde6 100644
--- a/tests/auto/palette/data/palette-appwindow-custom.qml
+++ b/tests/auto/quickcontrols2/palette/data/palette-appwindow-custom.qml
diff --git a/tests/auto/palette/data/palette-appwindow-default.qml b/tests/auto/quickcontrols2/palette/data/palette-appwindow-default.qml
index 9f2c34fe..9f2c34fe 100644
--- a/tests/auto/palette/data/palette-appwindow-default.qml
+++ b/tests/auto/quickcontrols2/palette/data/palette-appwindow-default.qml
diff --git a/tests/auto/palette/data/palette-control-custom.qml b/tests/auto/quickcontrols2/palette/data/palette-control-custom.qml
index 7f3bfde5..7f3bfde5 100644
--- a/tests/auto/palette/data/palette-control-custom.qml
+++ b/tests/auto/quickcontrols2/palette/data/palette-control-custom.qml
diff --git a/tests/auto/palette/data/palette-control-default.qml b/tests/auto/quickcontrols2/palette/data/palette-control-default.qml
index 48afa021..48afa021 100644
--- a/tests/auto/palette/data/palette-control-default.qml
+++ b/tests/auto/quickcontrols2/palette/data/palette-control-default.qml
diff --git a/tests/auto/palette/data/palette-popup-custom.qml b/tests/auto/quickcontrols2/palette/data/palette-popup-custom.qml
index 6f35f452..6f35f452 100644
--- a/tests/auto/palette/data/palette-popup-custom.qml
+++ b/tests/auto/quickcontrols2/palette/data/palette-popup-custom.qml
diff --git a/tests/auto/palette/data/palette-popup-default.qml b/tests/auto/quickcontrols2/palette/data/palette-popup-default.qml
index 77676bac..77676bac 100644
--- a/tests/auto/palette/data/palette-popup-default.qml
+++ b/tests/auto/quickcontrols2/palette/data/palette-popup-default.qml
diff --git a/tests/auto/palette/data/set-palette.qml b/tests/auto/quickcontrols2/palette/data/set-palette.qml
index 2d0fe194..2d0fe194 100644
--- a/tests/auto/palette/data/set-palette.qml
+++ b/tests/auto/quickcontrols2/palette/data/set-palette.qml
diff --git a/tests/auto/palette/qtquickcontrols2.conf b/tests/auto/quickcontrols2/palette/qtquickcontrols2.conf
index c5de6b36..c5de6b36 100644
--- a/tests/auto/palette/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols2/palette/qtquickcontrols2.conf
diff --git a/tests/auto/palette/tst_palette.cpp b/tests/auto/quickcontrols2/palette/tst_palette.cpp
index d8e1a3bf..d8e1a3bf 100644
--- a/tests/auto/palette/tst_palette.cpp
+++ b/tests/auto/quickcontrols2/palette/tst_palette.cpp
diff --git a/tests/auto/platform/CMakeLists.txt b/tests/auto/quickcontrols2/platform/CMakeLists.txt
index 6633de5c..6633de5c 100644
--- a/tests/auto/platform/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/platform/CMakeLists.txt
diff --git a/tests/auto/platform/data/tst_colordialog.qml b/tests/auto/quickcontrols2/platform/data/tst_colordialog.qml
index 12055a5a..12055a5a 100644
--- a/tests/auto/platform/data/tst_colordialog.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_colordialog.qml
diff --git a/tests/auto/platform/data/tst_filedialog.qml b/tests/auto/quickcontrols2/platform/data/tst_filedialog.qml
index 5a63dd23..5a63dd23 100644
--- a/tests/auto/platform/data/tst_filedialog.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_filedialog.qml
diff --git a/tests/auto/platform/data/tst_folderdialog.qml b/tests/auto/quickcontrols2/platform/data/tst_folderdialog.qml
index 37881c1a..37881c1a 100644
--- a/tests/auto/platform/data/tst_folderdialog.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_folderdialog.qml
diff --git a/tests/auto/platform/data/tst_fontdialog.qml b/tests/auto/quickcontrols2/platform/data/tst_fontdialog.qml
index edb62e52..edb62e52 100644
--- a/tests/auto/platform/data/tst_fontdialog.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_fontdialog.qml
diff --git a/tests/auto/platform/data/tst_menu.qml b/tests/auto/quickcontrols2/platform/data/tst_menu.qml
index 7e389222..7e389222 100644
--- a/tests/auto/platform/data/tst_menu.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_menu.qml
diff --git a/tests/auto/platform/data/tst_menubar.qml b/tests/auto/quickcontrols2/platform/data/tst_menubar.qml
index 0dd9eb91..0dd9eb91 100644
--- a/tests/auto/platform/data/tst_menubar.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_menubar.qml
diff --git a/tests/auto/platform/data/tst_menuitem.qml b/tests/auto/quickcontrols2/platform/data/tst_menuitem.qml
index 0120832d..0120832d 100644
--- a/tests/auto/platform/data/tst_menuitem.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_menuitem.qml
diff --git a/tests/auto/platform/data/tst_menuitemgroup.qml b/tests/auto/quickcontrols2/platform/data/tst_menuitemgroup.qml
index 117f79ce..117f79ce 100644
--- a/tests/auto/platform/data/tst_menuitemgroup.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_menuitemgroup.qml
diff --git a/tests/auto/platform/data/tst_menuseparator.qml b/tests/auto/quickcontrols2/platform/data/tst_menuseparator.qml
index 52bb349f..52bb349f 100644
--- a/tests/auto/platform/data/tst_menuseparator.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_menuseparator.qml
diff --git a/tests/auto/platform/data/tst_messagedialog.qml b/tests/auto/quickcontrols2/platform/data/tst_messagedialog.qml
index 23a5c821..23a5c821 100644
--- a/tests/auto/platform/data/tst_messagedialog.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_messagedialog.qml
diff --git a/tests/auto/platform/data/tst_standardpaths.qml b/tests/auto/quickcontrols2/platform/data/tst_standardpaths.qml
index 1edc67a8..1edc67a8 100644
--- a/tests/auto/platform/data/tst_standardpaths.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_standardpaths.qml
diff --git a/tests/auto/platform/data/tst_systemtrayicon.qml b/tests/auto/quickcontrols2/platform/data/tst_systemtrayicon.qml
index 09f10261..09f10261 100644
--- a/tests/auto/platform/data/tst_systemtrayicon.qml
+++ b/tests/auto/quickcontrols2/platform/data/tst_systemtrayicon.qml
diff --git a/tests/auto/platform/tst_platform.cpp b/tests/auto/quickcontrols2/platform/tst_platform.cpp
index 129b0f43..129b0f43 100644
--- a/tests/auto/platform/tst_platform.cpp
+++ b/tests/auto/quickcontrols2/platform/tst_platform.cpp
diff --git a/tests/auto/pressandhold/CMakeLists.txt b/tests/auto/quickcontrols2/pressandhold/CMakeLists.txt
index 926d446f..926d446f 100644
--- a/tests/auto/pressandhold/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/pressandhold/CMakeLists.txt
diff --git a/tests/auto/pressandhold/data/dependencies.qml b/tests/auto/quickcontrols2/pressandhold/data/dependencies.qml
index 280cfd29..280cfd29 100644
--- a/tests/auto/pressandhold/data/dependencies.qml
+++ b/tests/auto/quickcontrols2/pressandhold/data/dependencies.qml
diff --git a/tests/auto/pressandhold/tst_pressandhold.cpp b/tests/auto/quickcontrols2/pressandhold/tst_pressandhold.cpp
index 1eb5eebc..1eb5eebc 100644
--- a/tests/auto/pressandhold/tst_pressandhold.cpp
+++ b/tests/auto/quickcontrols2/pressandhold/tst_pressandhold.cpp
diff --git a/tests/auto/qquickapplicationwindow/CMakeLists.txt b/tests/auto/quickcontrols2/qquickapplicationwindow/CMakeLists.txt
index 1c346d15..d3d013ac 100644
--- a/tests/auto/qquickapplicationwindow/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickapplicationwindow
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickapplicationwindow.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/activeFocusControl.qml
index ef694990..ef694990 100644
--- a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/activeFocusControl.qml
diff --git a/tests/auto/qquickapplicationwindow/data/activefocusontab.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/activefocusontab.qml
index 07d783ac..07d783ac 100644
--- a/tests/auto/qquickapplicationwindow/data/activefocusontab.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/activefocusontab.qml
diff --git a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/attachedProperties.qml
index d241d995..d241d995 100644
--- a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/attachedProperties.qml
diff --git a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/basicapplicationwindow.qml
index 738022e9..738022e9 100644
--- a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/basicapplicationwindow.qml
diff --git a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/clearfocusondestruction.qml
index bf8f61b7..bf8f61b7 100644
--- a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/clearfocusondestruction.qml
diff --git a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/defaultFocus.qml
index 4651c2fc..4651c2fc 100644
--- a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/defaultFocus.qml
diff --git a/tests/auto/qquickapplicationwindow/data/fill.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/fill.qml
index 082e2409..082e2409 100644
--- a/tests/auto/qquickapplicationwindow/data/fill.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/fill.qml
diff --git a/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/focusAfterPopupClosed.qml
index ca8da3c2..ca8da3c2 100644
--- a/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/focusAfterPopupClosed.qml
diff --git a/tests/auto/qquickapplicationwindow/data/font.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/font.qml
index f0abbb9a..f0abbb9a 100644
--- a/tests/auto/qquickapplicationwindow/data/font.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/font.qml
diff --git a/tests/auto/qquickapplicationwindow/data/layout.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/layout.qml
index 6d4f3794..6d4f3794 100644
--- a/tests/auto/qquickapplicationwindow/data/layout.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/layout.qml
diff --git a/tests/auto/qquickapplicationwindow/data/layoutLayout.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/layoutLayout.qml
index 670306fa..670306fa 100644
--- a/tests/auto/qquickapplicationwindow/data/layoutLayout.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/layoutLayout.qml
diff --git a/tests/auto/qquickapplicationwindow/data/locale.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/locale.qml
index 243ce440..243ce440 100644
--- a/tests/auto/qquickapplicationwindow/data/locale.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/locale.qml
diff --git a/tests/auto/qquickapplicationwindow/data/opacity.qml b/tests/auto/quickcontrols2/qquickapplicationwindow/data/opacity.qml
index d3272522..d3272522 100644
--- a/tests/auto/qquickapplicationwindow/data/opacity.qml
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/data/opacity.qml
diff --git a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
index f6bf7d74..f6bf7d74 100644
--- a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
+++ b/tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
diff --git a/tests/auto/qquickcolor/CMakeLists.txt b/tests/auto/quickcontrols2/qquickcolor/CMakeLists.txt
index 2cbbe9eb..2cbbe9eb 100644
--- a/tests/auto/qquickcolor/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickcolor/CMakeLists.txt
diff --git a/tests/auto/qquickcolor/data/tst_color.qml b/tests/auto/quickcontrols2/qquickcolor/data/tst_color.qml
index cdd07e14..cdd07e14 100644
--- a/tests/auto/qquickcolor/data/tst_color.qml
+++ b/tests/auto/quickcontrols2/qquickcolor/data/tst_color.qml
diff --git a/tests/auto/qquickcolor/tst_qquickcolor.cpp b/tests/auto/quickcontrols2/qquickcolor/tst_qquickcolor.cpp
index 94c60080..94c60080 100644
--- a/tests/auto/qquickcolor/tst_qquickcolor.cpp
+++ b/tests/auto/quickcontrols2/qquickcolor/tst_qquickcolor.cpp
diff --git a/tests/auto/qquickcontrol/CMakeLists.txt b/tests/auto/quickcontrols2/qquickcontrol/CMakeLists.txt
index 3448a8c7..dc35e030 100644
--- a/tests/auto/qquickcontrol/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickcontrol/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickcontrol
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickcontrol.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickcontrol/data/flickable.qml b/tests/auto/quickcontrols2/qquickcontrol/data/flickable.qml
index 0ac72320..0ac72320 100644
--- a/tests/auto/qquickcontrol/data/flickable.qml
+++ b/tests/auto/quickcontrols2/qquickcontrol/data/flickable.qml
diff --git a/tests/auto/qquickcontrol/tst_qquickcontrol.cpp b/tests/auto/quickcontrols2/qquickcontrol/tst_qquickcontrol.cpp
index 8b38bf7b..8b38bf7b 100644
--- a/tests/auto/qquickcontrol/tst_qquickcontrol.cpp
+++ b/tests/auto/quickcontrols2/qquickcontrol/tst_qquickcontrol.cpp
diff --git a/tests/auto/qquickdrawer/BLACKLIST b/tests/auto/quickcontrols2/qquickdrawer/BLACKLIST
index 9f3f96be..9f3f96be 100644
--- a/tests/auto/qquickdrawer/BLACKLIST
+++ b/tests/auto/quickcontrols2/qquickdrawer/BLACKLIST
diff --git a/tests/auto/qquickdrawer/CMakeLists.txt b/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt
index 812e4d20..a3ab2bb2 100644
--- a/tests/auto/qquickdrawer/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickdrawer
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickdrawer.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickdrawer/data/applicationwindow-button.qml b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-button.qml
index a7c70e04..a7c70e04 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-button.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-button.qml
diff --git a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-hover.qml
index 8b8efb48..8b8efb48 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-hover.qml
diff --git a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-wheel.qml
index 449fbadb..449fbadb 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-wheel.qml
diff --git a/tests/auto/qquickdrawer/data/applicationwindow.qml b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow.qml
index 3f2ed118..3f2ed118 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow.qml
diff --git a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml b/tests/auto/quickcontrols2/qquickdrawer/data/dragOverModalShadow.qml
index 6d2951f7..6d2951f7 100644
--- a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/dragOverModalShadow.qml
diff --git a/tests/auto/qquickdrawer/data/flickable.qml b/tests/auto/quickcontrols2/qquickdrawer/data/flickable.qml
index b3f98d9e..b3f98d9e 100644
--- a/tests/auto/qquickdrawer/data/flickable.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/flickable.qml
diff --git a/tests/auto/qquickdrawer/data/grabber.qml b/tests/auto/quickcontrols2/qquickdrawer/data/grabber.qml
index bd1b84aa..bd1b84aa 100644
--- a/tests/auto/qquickdrawer/data/grabber.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/grabber.qml
diff --git a/tests/auto/qquickdrawer/data/header.qml b/tests/auto/quickcontrols2/qquickdrawer/data/header.qml
index dfd64ab1..dfd64ab1 100644
--- a/tests/auto/qquickdrawer/data/header.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/header.qml
diff --git a/tests/auto/qquickdrawer/data/multiTouch.qml b/tests/auto/quickcontrols2/qquickdrawer/data/multiTouch.qml
index 03b69c4e..03b69c4e 100644
--- a/tests/auto/qquickdrawer/data/multiTouch.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/multiTouch.qml
diff --git a/tests/auto/qquickdrawer/data/multiple.qml b/tests/auto/quickcontrols2/qquickdrawer/data/multiple.qml
index d4d5fbd6..d4d5fbd6 100644
--- a/tests/auto/qquickdrawer/data/multiple.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/multiple.qml
diff --git a/tests/auto/qquickdrawer/data/reposition.qml b/tests/auto/quickcontrols2/qquickdrawer/data/reposition.qml
index e3211fab..e3211fab 100644
--- a/tests/auto/qquickdrawer/data/reposition.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/reposition.qml
diff --git a/tests/auto/qquickdrawer/data/slider.qml b/tests/auto/quickcontrols2/qquickdrawer/data/slider.qml
index b3db5a7b..b3db5a7b 100644
--- a/tests/auto/qquickdrawer/data/slider.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/slider.qml
diff --git a/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml b/tests/auto/quickcontrols2/qquickdrawer/data/topEdgeScreenEdge.qml
index d2aaf486..d2aaf486 100644
--- a/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/topEdgeScreenEdge.qml
diff --git a/tests/auto/qquickdrawer/data/window-button.qml b/tests/auto/quickcontrols2/qquickdrawer/data/window-button.qml
index 02247dd0..02247dd0 100644
--- a/tests/auto/qquickdrawer/data/window-button.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/window-button.qml
diff --git a/tests/auto/qquickdrawer/data/window-hover.qml b/tests/auto/quickcontrols2/qquickdrawer/data/window-hover.qml
index e0b016cc..e0b016cc 100644
--- a/tests/auto/qquickdrawer/data/window-hover.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/window-hover.qml
diff --git a/tests/auto/qquickdrawer/data/window-wheel.qml b/tests/auto/quickcontrols2/qquickdrawer/data/window-wheel.qml
index e9c2eb42..e9c2eb42 100644
--- a/tests/auto/qquickdrawer/data/window-wheel.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/window-wheel.qml
diff --git a/tests/auto/qquickdrawer/data/window.qml b/tests/auto/quickcontrols2/qquickdrawer/data/window.qml
index 4bd9c9d2..4bd9c9d2 100644
--- a/tests/auto/qquickdrawer/data/window.qml
+++ b/tests/auto/quickcontrols2/qquickdrawer/data/window.qml
diff --git a/tests/auto/qquickdrawer/tst_qquickdrawer.cpp b/tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer.cpp
index 2c7ec045..2c7ec045 100644
--- a/tests/auto/qquickdrawer/tst_qquickdrawer.cpp
+++ b/tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer.cpp
diff --git a/tests/auto/qquickheaderview/CMakeLists.txt b/tests/auto/quickcontrols2/qquickheaderview/CMakeLists.txt
index 9f428a48..6a8f0fae 100644
--- a/tests/auto/qquickheaderview/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickheaderview/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickheaderview
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickheaderview.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickheaderview/data/ListModel.qml b/tests/auto/quickcontrols2/qquickheaderview/data/ListModel.qml
index b8160a46..b8160a46 100644
--- a/tests/auto/qquickheaderview/data/ListModel.qml
+++ b/tests/auto/quickcontrols2/qquickheaderview/data/ListModel.qml
diff --git a/tests/auto/qquickheaderview/data/Window.qml b/tests/auto/quickcontrols2/qquickheaderview/data/Window.qml
index 9bf9963c..9bf9963c 100644
--- a/tests/auto/qquickheaderview/data/Window.qml
+++ b/tests/auto/quickcontrols2/qquickheaderview/data/Window.qml
diff --git a/tests/auto/qquickheaderview/tst_qquickheaderview.cpp b/tests/auto/quickcontrols2/qquickheaderview/tst_qquickheaderview.cpp
index db2529cb..db2529cb 100644
--- a/tests/auto/qquickheaderview/tst_qquickheaderview.cpp
+++ b/tests/auto/quickcontrols2/qquickheaderview/tst_qquickheaderview.cpp
diff --git a/tests/auto/qquickiconimage/CMakeLists.txt b/tests/auto/quickcontrols2/qquickiconimage/CMakeLists.txt
index dbe810ac..d11779bc 100644
--- a/tests/auto/qquickiconimage/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickiconimage/CMakeLists.txt
@@ -21,7 +21,7 @@ qt_internal_add_test(tst_qquickiconimage
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickiconimage.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     LIBRARIES
         Qt::QuickControls2ImplPrivate
         Qt::QuickPrivate
diff --git a/tests/auto/qquickiconimage/data/alignment.qml b/tests/auto/quickcontrols2/qquickiconimage/data/alignment.qml
index e6861520..e6861520 100644
--- a/tests/auto/qquickiconimage/data/alignment.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/alignment.qml
diff --git a/tests/auto/qquickiconimage/data/color.qml b/tests/auto/quickcontrols2/qquickiconimage/data/color.qml
index b44b4388..b44b4388 100644
--- a/tests/auto/qquickiconimage/data/color.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/color.qml
diff --git a/tests/auto/qquickiconimage/data/fileSelectors.qml b/tests/auto/quickcontrols2/qquickiconimage/data/fileSelectors.qml
index e6861520..e6861520 100644
--- a/tests/auto/qquickiconimage/data/fileSelectors.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/fileSelectors.qml
diff --git a/tests/auto/qquickiconimage/data/imageProvider.qml b/tests/auto/quickcontrols2/qquickiconimage/data/imageProvider.qml
index 9b18a99e..9b18a99e 100644
--- a/tests/auto/qquickiconimage/data/imageProvider.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/imageProvider.qml
diff --git a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml b/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingNoSizes.qml
index d457d205..d457d205 100644
--- a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingNoSizes.qml
diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml b/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSize.qml
index e6861520..e6861520 100644
--- a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSize.qml
diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml b/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
index 5e7ebefc..5e7ebefc 100644
--- a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
diff --git a/tests/auto/qquickiconimage/data/root.qml b/tests/auto/quickcontrols2/qquickiconimage/data/root.qml
index ed02d2df..ed02d2df 100644
--- a/tests/auto/qquickiconimage/data/root.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/root.qml
diff --git a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml b/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingNoSizes.qml
index 34fc6b33..34fc6b33 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingNoSizes.qml
diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml b/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSize.qml
index 9f1b6290..9f1b6290 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSize.qml
diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml b/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
index 4dc3ac75..4dc3ac75 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml b/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceTooLarge.qml
index a54d998a..a54d998a 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceTooLarge.qml
diff --git a/tests/auto/qquickiconimage/data/svgNoSizes.qml b/tests/auto/quickcontrols2/qquickiconimage/data/svgNoSizes.qml
index e29c23c5..e29c23c5 100644
--- a/tests/auto/qquickiconimage/data/svgNoSizes.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/svgNoSizes.qml
diff --git a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml b/tests/auto/quickcontrols2/qquickiconimage/data/svgSourceBindingSourceSize.qml
index 4674e8f1..4674e8f1 100644
--- a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/svgSourceBindingSourceSize.qml
diff --git a/tests/auto/qquickiconimage/data/translucentColors.qml b/tests/auto/quickcontrols2/qquickiconimage/data/translucentColors.qml
index ad67bfe5..ad67bfe5 100644
--- a/tests/auto/qquickiconimage/data/translucentColors.qml
+++ b/tests/auto/quickcontrols2/qquickiconimage/data/translucentColors.qml
diff --git a/tests/auto/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png
index 4356af95..4356af95 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png
diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png
index d3134a55..d3134a55 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png
diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png
index 250b94b0..250b94b0 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png
diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png
index 04cd010a..04cd010a 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png
diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png
index a63bbaf4..a63bbaf4 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png
diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png
index c17d1664..c17d1664 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png
diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png
index d4411658..d4411658 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png
diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png
index 6f7938e3..6f7938e3 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png
diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png
index 9215fc42..9215fc42 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png
diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png
index 250b94b0..250b94b0 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png
diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png
index a63bbaf4..a63bbaf4 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png
diff --git a/tests/auto/qquickiconimage/icons/testtheme/appointment-new.svg b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/appointment-new.svg
index 4cb14f82..4cb14f82 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/appointment-new.svg
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/appointment-new.svg
diff --git a/tests/auto/qquickiconimage/icons/testtheme/index.theme b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/index.theme
index 6ab6c15c..6ab6c15c 100644
--- a/tests/auto/qquickiconimage/icons/testtheme/index.theme
+++ b/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/index.theme
diff --git a/tests/auto/qquickiconimage/resources.qrc b/tests/auto/quickcontrols2/qquickiconimage/resources.qrc
index 6558b039..6558b039 100644
--- a/tests/auto/qquickiconimage/resources.qrc
+++ b/tests/auto/quickcontrols2/qquickiconimage/resources.qrc
diff --git a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp b/tests/auto/quickcontrols2/qquickiconimage/tst_qquickiconimage.cpp
index 475981a2..475981a2 100644
--- a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp
+++ b/tests/auto/quickcontrols2/qquickiconimage/tst_qquickiconimage.cpp
diff --git a/tests/auto/qquickiconlabel/CMakeLists.txt b/tests/auto/quickcontrols2/qquickiconlabel/CMakeLists.txt
index a26abc48..42bbf91f 100644
--- a/tests/auto/qquickiconlabel/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickiconlabel/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickiconlabel
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickiconlabel.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     LIBRARIES
         Qt::QuickControls2ImplPrivate
         Qt::QuickPrivate
diff --git a/tests/auto/qquickiconlabel/data/colorChanges.qml b/tests/auto/quickcontrols2/qquickiconlabel/data/colorChanges.qml
index cd69508e..cd69508e 100644
--- a/tests/auto/qquickiconlabel/data/colorChanges.qml
+++ b/tests/auto/quickcontrols2/qquickiconlabel/data/colorChanges.qml
diff --git a/tests/auto/qquickiconlabel/data/iconlabel.qml b/tests/auto/quickcontrols2/qquickiconlabel/data/iconlabel.qml
index 94f36a7b..94f36a7b 100644
--- a/tests/auto/qquickiconlabel/data/iconlabel.qml
+++ b/tests/auto/quickcontrols2/qquickiconlabel/data/iconlabel.qml
diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml b/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyIcon.qml
index c00ffbb8..c00ffbb8 100644
--- a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
+++ b/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyIcon.qml
diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml b/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyText.qml
index 20c61706..20c61706 100644
--- a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml
+++ b/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyText.qml
diff --git a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp b/tests/auto/quickcontrols2/qquickiconlabel/tst_qquickiconlabel.cpp
index 526ecf05..526ecf05 100644
--- a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
+++ b/tests/auto/quickcontrols2/qquickiconlabel/tst_qquickiconlabel.cpp
diff --git a/tests/auto/qquickimaginestyle/CMakeLists.txt b/tests/auto/quickcontrols2/qquickimaginestyle/CMakeLists.txt
index 568c4441..568c4441 100644
--- a/tests/auto/qquickimaginestyle/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickimaginestyle/CMakeLists.txt
diff --git a/tests/auto/qquickimaginestyle/control-assets/button-background.9.png b/tests/auto/quickcontrols2/qquickimaginestyle/control-assets/button-background.9.png
index 18ec9e6f..18ec9e6f 100644
--- a/tests/auto/qquickimaginestyle/control-assets/button-background.9.png
+++ b/tests/auto/quickcontrols2/qquickimaginestyle/control-assets/button-background.9.png
diff --git a/tests/auto/qquickimaginestyle/data/tst_imagine.qml b/tests/auto/quickcontrols2/qquickimaginestyle/data/tst_imagine.qml
index 493ff766..493ff766 100644
--- a/tests/auto/qquickimaginestyle/data/tst_imagine.qml
+++ b/tests/auto/quickcontrols2/qquickimaginestyle/data/tst_imagine.qml
diff --git a/tests/auto/qquickimaginestyle/qtquickcontrols2.conf b/tests/auto/quickcontrols2/qquickimaginestyle/qtquickcontrols2.conf
index cc58a8e3..cc58a8e3 100644
--- a/tests/auto/qquickimaginestyle/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols2/qquickimaginestyle/qtquickcontrols2.conf
diff --git a/tests/auto/qquickimaginestyle/test-assets/button-background-1.png b/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-1.png
index 980eec3c..980eec3c 100644
--- a/tests/auto/qquickimaginestyle/test-assets/button-background-1.png
+++ b/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-1.png
diff --git a/tests/auto/qquickimaginestyle/test-assets/button-background-2.png b/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-2.png
index 8e2639d0..8e2639d0 100644
--- a/tests/auto/qquickimaginestyle/test-assets/button-background-2.png
+++ b/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-2.png
diff --git a/tests/auto/qquickimaginestyle/tst_qquickimaginestyle.cpp b/tests/auto/quickcontrols2/qquickimaginestyle/tst_qquickimaginestyle.cpp
index cd08923a..cd08923a 100644
--- a/tests/auto/qquickimaginestyle/tst_qquickimaginestyle.cpp
+++ b/tests/auto/quickcontrols2/qquickimaginestyle/tst_qquickimaginestyle.cpp
diff --git a/tests/auto/qquickmaterialstyle/CMakeLists.txt b/tests/auto/quickcontrols2/qquickmaterialstyle/CMakeLists.txt
index 332f376d..332f376d 100644
--- a/tests/auto/qquickmaterialstyle/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickmaterialstyle/CMakeLists.txt
diff --git a/tests/auto/qquickmaterialstyle/data/tst_material.qml b/tests/auto/quickcontrols2/qquickmaterialstyle/data/tst_material.qml
index 02b71305..02b71305 100644
--- a/tests/auto/qquickmaterialstyle/data/tst_material.qml
+++ b/tests/auto/quickcontrols2/qquickmaterialstyle/data/tst_material.qml
diff --git a/tests/auto/qquickmaterialstyle/qtquickcontrols2.conf b/tests/auto/quickcontrols2/qquickmaterialstyle/qtquickcontrols2.conf
index b6c7c87e..b6c7c87e 100644
--- a/tests/auto/qquickmaterialstyle/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols2/qquickmaterialstyle/qtquickcontrols2.conf
diff --git a/tests/auto/qquickmaterialstyle/tst_qquickmaterialstyle.cpp b/tests/auto/quickcontrols2/qquickmaterialstyle/tst_qquickmaterialstyle.cpp
index 269f7986..269f7986 100644
--- a/tests/auto/qquickmaterialstyle/tst_qquickmaterialstyle.cpp
+++ b/tests/auto/quickcontrols2/qquickmaterialstyle/tst_qquickmaterialstyle.cpp
diff --git a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/quickcontrols2/qquickmaterialstyleconf/CMakeLists.txt
index 72d848dc..5ccda88b 100644
--- a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickmaterialstyleconf/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickmaterialstyleconf
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickmaterialstyleconf.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml b/tests/auto/quickcontrols2/qquickmaterialstyleconf/data/applicationwindow.qml
index 1ce4598d..1ce4598d 100644
--- a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols2/qquickmaterialstyleconf/data/applicationwindow.qml
diff --git a/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc b/tests/auto/quickcontrols2/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc
index 49219139..49219139 100644
--- a/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc
+++ b/tests/auto/quickcontrols2/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc
diff --git a/tests/auto/qquickmaterialstyleconf/qtquickcontrols2.conf b/tests/auto/quickcontrols2/qquickmaterialstyleconf/qtquickcontrols2.conf
index 30cee878..30cee878 100644
--- a/tests/auto/qquickmaterialstyleconf/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols2/qquickmaterialstyleconf/qtquickcontrols2.conf
diff --git a/tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp b/tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp
index e0fd8fef..e0fd8fef 100644
--- a/tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp
+++ b/tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp
diff --git a/tests/auto/qquickmaterialstyleconf/variant-dense.conf b/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-dense.conf
index 6636894e..6636894e 100644
--- a/tests/auto/qquickmaterialstyleconf/variant-dense.conf
+++ b/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-dense.conf
diff --git a/tests/auto/qquickmaterialstyleconf/variant-normal.conf b/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-normal.conf
index 08778e92..08778e92 100644
--- a/tests/auto/qquickmaterialstyleconf/variant-normal.conf
+++ b/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-normal.conf
diff --git a/tests/auto/qquickmenu/BLACKLIST b/tests/auto/quickcontrols2/qquickmenu/BLACKLIST
index f71a4e03..f71a4e03 100644
--- a/tests/auto/qquickmenu/BLACKLIST
+++ b/tests/auto/quickcontrols2/qquickmenu/BLACKLIST
diff --git a/tests/auto/qquickmenu/CMakeLists.txt b/tests/auto/quickcontrols2/qquickmenu/CMakeLists.txt
index 10c28116..f0cfa15d 100644
--- a/tests/auto/qquickmenu/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickmenu/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickmenu
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickmenu.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickmenu/data/actions.qml b/tests/auto/quickcontrols2/qquickmenu/data/actions.qml
index 226c9450..226c9450 100644
--- a/tests/auto/qquickmenu/data/actions.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/actions.qml
diff --git a/tests/auto/qquickmenu/data/addItem.qml b/tests/auto/quickcontrols2/qquickmenu/data/addItem.qml
index b9d38afd..b9d38afd 100644
--- a/tests/auto/qquickmenu/data/addItem.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/addItem.qml
diff --git a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml b/tests/auto/quickcontrols2/qquickmenu/data/applicationWindowScrollable.qml
index 22ab278e..22ab278e 100644
--- a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/applicationWindowScrollable.qml
diff --git a/tests/auto/qquickmenu/data/applicationwindow.qml b/tests/auto/quickcontrols2/qquickmenu/data/applicationwindow.qml
index d15c0a88..d15c0a88 100644
--- a/tests/auto/qquickmenu/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/applicationwindow.qml
diff --git a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml b/tests/auto/quickcontrols2/qquickmenu/data/delegateFromSeparateComponent.qml
index b2af27e9..b2af27e9 100644
--- a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/delegateFromSeparateComponent.qml
diff --git a/tests/auto/qquickmenu/data/disableWhenTriggered.qml b/tests/auto/quickcontrols2/qquickmenu/data/disableWhenTriggered.qml
index 9de8868f..9de8868f 100644
--- a/tests/auto/qquickmenu/data/disableWhenTriggered.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/disableWhenTriggered.qml
diff --git a/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml b/tests/auto/quickcontrols2/qquickmenu/data/disabledMenuItemKeyNavigation.qml
index 496544e9..496544e9 100644
--- a/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/disabledMenuItemKeyNavigation.qml
diff --git a/tests/auto/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml b/tests/auto/quickcontrols2/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
index 78fa236f..78fa236f 100644
--- a/tests/auto/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
diff --git a/tests/auto/qquickmenu/data/menuItemWidths.qml b/tests/auto/quickcontrols2/qquickmenu/data/menuItemWidths.qml
index e956a29f..e956a29f 100644
--- a/tests/auto/qquickmenu/data/menuItemWidths.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/menuItemWidths.qml
diff --git a/tests/auto/qquickmenu/data/menuSeparator.qml b/tests/auto/quickcontrols2/qquickmenu/data/menuSeparator.qml
index d71d99c5..d71d99c5 100644
--- a/tests/auto/qquickmenu/data/menuSeparator.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/menuSeparator.qml
diff --git a/tests/auto/qquickmenu/data/mnemonics.qml b/tests/auto/quickcontrols2/qquickmenu/data/mnemonics.qml
index 6525e59e..6525e59e 100644
--- a/tests/auto/qquickmenu/data/mnemonics.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/mnemonics.qml
diff --git a/tests/auto/qquickmenu/data/order.qml b/tests/auto/quickcontrols2/qquickmenu/data/order.qml
index f2f18168..f2f18168 100644
--- a/tests/auto/qquickmenu/data/order.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/order.qml
diff --git a/tests/auto/qquickmenu/data/popup.qml b/tests/auto/quickcontrols2/qquickmenu/data/popup.qml
index 88c08b46..88c08b46 100644
--- a/tests/auto/qquickmenu/data/popup.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/popup.qml
diff --git a/tests/auto/qquickmenu/data/pressAndHold.qml b/tests/auto/quickcontrols2/qquickmenu/data/pressAndHold.qml
index a16a15da..a16a15da 100644
--- a/tests/auto/qquickmenu/data/pressAndHold.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/pressAndHold.qml
diff --git a/tests/auto/qquickmenu/data/removeTakeItem.qml b/tests/auto/quickcontrols2/qquickmenu/data/removeTakeItem.qml
index cfe7585e..cfe7585e 100644
--- a/tests/auto/qquickmenu/data/removeTakeItem.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/removeTakeItem.qml
diff --git a/tests/auto/qquickmenu/data/repeater.qml b/tests/auto/quickcontrols2/qquickmenu/data/repeater.qml
index 50c8adcb..50c8adcb 100644
--- a/tests/auto/qquickmenu/data/repeater.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/repeater.qml
diff --git a/tests/auto/qquickmenu/data/scrollableWithPadding.qml b/tests/auto/quickcontrols2/qquickmenu/data/scrollableWithPadding.qml
index c8e73858..c8e73858 100644
--- a/tests/auto/qquickmenu/data/scrollableWithPadding.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/scrollableWithPadding.qml
diff --git a/tests/auto/qquickmenu/data/subMenuDisabled.qml b/tests/auto/quickcontrols2/qquickmenu/data/subMenuDisabled.qml
index e50ab7ab..e50ab7ab 100644
--- a/tests/auto/qquickmenu/data/subMenuDisabled.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/subMenuDisabled.qml
diff --git a/tests/auto/qquickmenu/data/subMenus.qml b/tests/auto/quickcontrols2/qquickmenu/data/subMenus.qml
index fad59ee6..fad59ee6 100644
--- a/tests/auto/qquickmenu/data/subMenus.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/subMenus.qml
diff --git a/tests/auto/qquickmenu/data/windowScrollable.qml b/tests/auto/quickcontrols2/qquickmenu/data/windowScrollable.qml
index 7c3a5234..7c3a5234 100644
--- a/tests/auto/qquickmenu/data/windowScrollable.qml
+++ b/tests/auto/quickcontrols2/qquickmenu/data/windowScrollable.qml
diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/quickcontrols2/qquickmenu/tst_qquickmenu.cpp
index b3d91dc8..b3d91dc8 100644
--- a/tests/auto/qquickmenu/tst_qquickmenu.cpp
+++ b/tests/auto/quickcontrols2/qquickmenu/tst_qquickmenu.cpp
diff --git a/tests/auto/qquickmenubar/CMakeLists.txt b/tests/auto/quickcontrols2/qquickmenubar/CMakeLists.txt
index 97575129..992e4306 100644
--- a/tests/auto/qquickmenubar/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickmenubar/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickmenubar
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickmenubar.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickmenubar/data/checkHighlightWhenDismissed.qml b/tests/auto/quickcontrols2/qquickmenubar/data/checkHighlightWhenDismissed.qml
index 14ee692e..14ee692e 100644
--- a/tests/auto/qquickmenubar/data/checkHighlightWhenDismissed.qml
+++ b/tests/auto/quickcontrols2/qquickmenubar/data/checkHighlightWhenDismissed.qml
diff --git a/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml b/tests/auto/quickcontrols2/qquickmenubar/data/delegateFromSeparateComponent.qml
index 76015190..76015190 100644
--- a/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml
+++ b/tests/auto/quickcontrols2/qquickmenubar/data/delegateFromSeparateComponent.qml
diff --git a/tests/auto/qquickmenubar/data/empty.qml b/tests/auto/quickcontrols2/qquickmenubar/data/empty.qml
index 6cb3c922..6cb3c922 100644
--- a/tests/auto/qquickmenubar/data/empty.qml
+++ b/tests/auto/quickcontrols2/qquickmenubar/data/empty.qml
diff --git a/tests/auto/qquickmenubar/data/menubar.qml b/tests/auto/quickcontrols2/qquickmenubar/data/menubar.qml
index 1436e66d..1436e66d 100644
--- a/tests/auto/qquickmenubar/data/menubar.qml
+++ b/tests/auto/quickcontrols2/qquickmenubar/data/menubar.qml
diff --git a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp b/tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar.cpp
index 05700240..05700240 100644
--- a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp
+++ b/tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar.cpp
diff --git a/tests/auto/qquickninepatchimage/CMakeLists.txt b/tests/auto/quickcontrols2/qquickninepatchimage/CMakeLists.txt
index 9d041643..2b747492 100644
--- a/tests/auto/qquickninepatchimage/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/CMakeLists.txt
@@ -21,7 +21,7 @@ qt_internal_add_test(tst_qquickninepatchimage
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickninepatchimage.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     LIBRARIES
         Qt::GuiPrivate
         Qt::QuickControls2Private
diff --git a/tests/auto/qquickninepatchimage/data/foo.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/foo.9.png
index bac09a4d..bac09a4d 100644
--- a/tests/auto/qquickninepatchimage/data/foo.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/foo.9.png
diff --git a/tests/auto/qquickninepatchimage/data/foo@2x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@2x.9.png
index 43e4b478..43e4b478 100644
--- a/tests/auto/qquickninepatchimage/data/foo@2x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@2x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/foo@3x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@3x.9.png
index 4d199c84..4d199c84 100644
--- a/tests/auto/qquickninepatchimage/data/foo@3x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@3x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/foo@4x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@4x.9.png
index 018b8341..018b8341 100644
--- a/tests/auto/qquickninepatchimage/data/foo@4x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@4x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-all.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all.9.png
index a1899429..a1899429 100644
--- a/tests/auto/qquickninepatchimage/data/inset-all.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-all@2x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@2x.9.png
index d00d719c..d00d719c 100644
--- a/tests/auto/qquickninepatchimage/data/inset-all@2x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@2x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-all@3x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@3x.9.png
index 6130fd50..6130fd50 100644
--- a/tests/auto/qquickninepatchimage/data/inset-all@3x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@3x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-all@4x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@4x.9.png
index 2c2d1694..2c2d1694 100644
--- a/tests/auto/qquickninepatchimage/data/inset-all@4x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@4x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-bottomright.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright.9.png
index 2b3e58cb..2b3e58cb 100644
--- a/tests/auto/qquickninepatchimage/data/inset-bottomright.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-bottomright@2x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@2x.9.png
index 70aceb61..70aceb61 100644
--- a/tests/auto/qquickninepatchimage/data/inset-bottomright@2x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@2x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-bottomright@3x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@3x.9.png
index 032400ce..032400ce 100644
--- a/tests/auto/qquickninepatchimage/data/inset-bottomright@3x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@3x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-bottomright@4x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@4x.9.png
index d5cf85aa..d5cf85aa 100644
--- a/tests/auto/qquickninepatchimage/data/inset-bottomright@4x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@4x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-topleft.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft.9.png
index 05a2ff70..05a2ff70 100644
--- a/tests/auto/qquickninepatchimage/data/inset-topleft.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-topleft@2x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@2x.9.png
index a88f87a5..a88f87a5 100644
--- a/tests/auto/qquickninepatchimage/data/inset-topleft@2x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@2x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-topleft@3x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@3x.9.png
index 16349d22..16349d22 100644
--- a/tests/auto/qquickninepatchimage/data/inset-topleft@3x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@3x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/inset-topleft@4x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@4x.9.png
index 160fab61..160fab61 100644
--- a/tests/auto/qquickninepatchimage/data/inset-topleft@4x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@4x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/ninepatchimage.qml b/tests/auto/quickcontrols2/qquickninepatchimage/data/ninepatchimage.qml
index 410a61f9..410a61f9 100644
--- a/tests/auto/qquickninepatchimage/data/ninepatchimage.qml
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/ninepatchimage.qml
diff --git a/tests/auto/qquickninepatchimage/data/padding.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/padding.9.png
index 8a65afad..8a65afad 100644
--- a/tests/auto/qquickninepatchimage/data/padding.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/padding.9.png
diff --git a/tests/auto/qquickninepatchimage/data/padding@2x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@2x.9.png
index 101fc0cb..101fc0cb 100644
--- a/tests/auto/qquickninepatchimage/data/padding@2x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@2x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/padding@3x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@3x.9.png
index e07a93a2..e07a93a2 100644
--- a/tests/auto/qquickninepatchimage/data/padding@3x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@3x.9.png
diff --git a/tests/auto/qquickninepatchimage/data/padding@4x.9.png b/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@4x.9.png
index a3506444..a3506444 100644
--- a/tests/auto/qquickninepatchimage/data/padding@4x.9.png
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@4x.9.png
diff --git a/tests/auto/qquickninepatchimage/tst_qquickninepatchimage.cpp b/tests/auto/quickcontrols2/qquickninepatchimage/tst_qquickninepatchimage.cpp
index 5a62c00a..5a62c00a 100644
--- a/tests/auto/qquickninepatchimage/tst_qquickninepatchimage.cpp
+++ b/tests/auto/quickcontrols2/qquickninepatchimage/tst_qquickninepatchimage.cpp
diff --git a/tests/auto/qquickpopup/BLACKLIST b/tests/auto/quickcontrols2/qquickpopup/BLACKLIST
index ebe6d040..ebe6d040 100644
--- a/tests/auto/qquickpopup/BLACKLIST
+++ b/tests/auto/quickcontrols2/qquickpopup/BLACKLIST
diff --git a/tests/auto/qquickpopup/CMakeLists.txt b/tests/auto/quickcontrols2/qquickpopup/CMakeLists.txt
index 6fb43676..12a345ec 100644
--- a/tests/auto/qquickpopup/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickpopup/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickpopup
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickpopup.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml b/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose1.qml
index 9a76ebea..9a76ebea 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose1.qml
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml b/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose2.qml
index 6d004b17..6d004b17 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose2.qml
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml b/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose3.qml
index 8a682468..8a682468 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose3.qml
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml b/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
index adf23637..adf23637 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
diff --git a/tests/auto/qquickpopup/data/applicationwindow-hover.qml b/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-hover.qml
index 80b22e6d..80b22e6d 100644
--- a/tests/auto/qquickpopup/data/applicationwindow-hover.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-hover.qml
diff --git a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml b/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-wheel.qml
index 8d3f7f95..8d3f7f95 100644
--- a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-wheel.qml
diff --git a/tests/auto/qquickpopup/data/applicationwindow.qml b/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow.qml
index 7a298d96..7a298d96 100644
--- a/tests/auto/qquickpopup/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow.qml
diff --git a/tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml b/tests/auto/quickcontrols2/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
index aa25863a..aa25863a 100644
--- a/tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
diff --git a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml b/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
index 71ec4e2b..71ec4e2b 100644
--- a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
diff --git a/tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml b/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
index b65e4ec0..b65e4ec0 100644
--- a/tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
diff --git a/tests/auto/qquickpopup/data/countChanged.qml b/tests/auto/quickcontrols2/qquickpopup/data/countChanged.qml
index fd594332..fd594332 100644
--- a/tests/auto/qquickpopup/data/countChanged.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/countChanged.qml
diff --git a/tests/auto/qquickpopup/data/cursor.qml b/tests/auto/quickcontrols2/qquickpopup/data/cursor.qml
index e2a6e38e..e2a6e38e 100644
--- a/tests/auto/qquickpopup/data/cursor.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/cursor.qml
diff --git a/tests/auto/qquickpopup/data/destroyDuringExitTransition.qml b/tests/auto/quickcontrols2/qquickpopup/data/destroyDuringExitTransition.qml
index 67fca2e7..67fca2e7 100644
--- a/tests/auto/qquickpopup/data/destroyDuringExitTransition.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/destroyDuringExitTransition.qml
diff --git a/tests/auto/qquickpopup/data/dialog.qml b/tests/auto/quickcontrols2/qquickpopup/data/dialog.qml
index 75c0e1c6..75c0e1c6 100644
--- a/tests/auto/qquickpopup/data/dialog.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/dialog.qml
diff --git a/tests/auto/qquickpopup/data/disabledPalette.qml b/tests/auto/quickcontrols2/qquickpopup/data/disabledPalette.qml
index f1608aae..f1608aae 100644
--- a/tests/auto/qquickpopup/data/disabledPalette.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/disabledPalette.qml
diff --git a/tests/auto/qquickpopup/data/grabber.qml b/tests/auto/quickcontrols2/qquickpopup/data/grabber.qml
index 507cc3b5..507cc3b5 100644
--- a/tests/auto/qquickpopup/data/grabber.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/grabber.qml
diff --git a/tests/auto/qquickpopup/data/invisibleToolTipOpen.qml b/tests/auto/quickcontrols2/qquickpopup/data/invisibleToolTipOpen.qml
index aaed154b..aaed154b 100644
--- a/tests/auto/qquickpopup/data/invisibleToolTipOpen.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/invisibleToolTipOpen.qml
diff --git a/tests/auto/qquickpopup/data/nested.qml b/tests/auto/quickcontrols2/qquickpopup/data/nested.qml
index 03269cd1..03269cd1 100644
--- a/tests/auto/qquickpopup/data/nested.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/nested.qml
diff --git a/tests/auto/qquickpopup/data/orientation.qml b/tests/auto/quickcontrols2/qquickpopup/data/orientation.qml
index 9730a9e1..9730a9e1 100644
--- a/tests/auto/qquickpopup/data/orientation.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/orientation.qml
diff --git a/tests/auto/qquickpopup/data/tabFence.qml b/tests/auto/quickcontrols2/qquickpopup/data/tabFence.qml
index ce5b5417..ce5b5417 100644
--- a/tests/auto/qquickpopup/data/tabFence.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/tabFence.qml
diff --git a/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml b/tests/auto/quickcontrols2/qquickpopup/data/toolTipCrashOnClose.qml
index 33452182..33452182 100644
--- a/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/toolTipCrashOnClose.qml
diff --git a/tests/auto/qquickpopup/data/window-hover.qml b/tests/auto/quickcontrols2/qquickpopup/data/window-hover.qml
index e0eef302..e0eef302 100644
--- a/tests/auto/qquickpopup/data/window-hover.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/window-hover.qml
diff --git a/tests/auto/qquickpopup/data/window-wheel.qml b/tests/auto/quickcontrols2/qquickpopup/data/window-wheel.qml
index e476a1eb..e476a1eb 100644
--- a/tests/auto/qquickpopup/data/window-wheel.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/window-wheel.qml
diff --git a/tests/auto/qquickpopup/data/window.qml b/tests/auto/quickcontrols2/qquickpopup/data/window.qml
index f6b76b7e..f6b76b7e 100644
--- a/tests/auto/qquickpopup/data/window.qml
+++ b/tests/auto/quickcontrols2/qquickpopup/data/window.qml
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp
index f932d18a..f932d18a 100644
--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp
diff --git a/tests/auto/qquickstyle/CMakeLists.txt b/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt
index 93b63a19..6295fb4e 100644
--- a/tests/auto/qquickstyle/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickstyle
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickstyle.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
diff --git a/tests/auto/qquickstyle/data/CmdLineArgStyle/Control.qml b/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/Control.qml
index 744dcd8f..744dcd8f 100644
--- a/tests/auto/qquickstyle/data/CmdLineArgStyle/Control.qml
+++ b/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/Control.qml
diff --git a/tests/auto/qquickstyle/data/CmdLineArgStyle/qmldir b/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/qmldir
index c2cc85c2..c2cc85c2 100644
--- a/tests/auto/qquickstyle/data/CmdLineArgStyle/qmldir
+++ b/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/qmldir
diff --git a/tests/auto/qquickstyle/data/Custom/Label.qml b/tests/auto/quickcontrols2/qquickstyle/data/Custom/Label.qml
index 744dcd8f..744dcd8f 100644
--- a/tests/auto/qquickstyle/data/Custom/Label.qml
+++ b/tests/auto/quickcontrols2/qquickstyle/data/Custom/Label.qml
diff --git a/tests/auto/qquickstyle/data/Custom/qmldir b/tests/auto/quickcontrols2/qquickstyle/data/Custom/qmldir
index 08de6fa8..08de6fa8 100644
--- a/tests/auto/qquickstyle/data/Custom/qmldir
+++ b/tests/auto/quickcontrols2/qquickstyle/data/Custom/qmldir
diff --git a/tests/auto/qquickstyle/data/EnvVarFallbackStyle/Control.qml b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/Control.qml
index 744dcd8f..744dcd8f 100644
--- a/tests/auto/qquickstyle/data/EnvVarFallbackStyle/Control.qml
+++ b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/Control.qml
diff --git a/tests/auto/qquickstyle/data/EnvVarFallbackStyle/qmldir b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/qmldir
index bebd8e07..bebd8e07 100644
--- a/tests/auto/qquickstyle/data/EnvVarFallbackStyle/qmldir
+++ b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/qmldir
diff --git a/tests/auto/qquickstyle/data/EnvVarStyle/Control.qml b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/Control.qml
index 744dcd8f..744dcd8f 100644
--- a/tests/auto/qquickstyle/data/EnvVarStyle/Control.qml
+++ b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/Control.qml
diff --git a/tests/auto/qquickstyle/data/EnvVarStyle/qmldir b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/qmldir
index 42223a19..42223a19 100644
--- a/tests/auto/qquickstyle/data/EnvVarStyle/qmldir
+++ b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/qmldir
diff --git a/tests/auto/qquickstyle/data/basic.conf b/tests/auto/quickcontrols2/qquickstyle/data/basic.conf
index 17ef59ee..17ef59ee 100644
--- a/tests/auto/qquickstyle/data/basic.conf
+++ b/tests/auto/quickcontrols2/qquickstyle/data/basic.conf
diff --git a/tests/auto/qquickstyle/data/custom.conf b/tests/auto/quickcontrols2/qquickstyle/data/custom.conf
index ac79338c..ac79338c 100644
--- a/tests/auto/qquickstyle/data/custom.conf
+++ b/tests/auto/quickcontrols2/qquickstyle/data/custom.conf
diff --git a/tests/auto/qquickstyle/data/dependencies.qml b/tests/auto/quickcontrols2/qquickstyle/data/dependencies.qml
index 280cfd29..280cfd29 100644
--- a/tests/auto/qquickstyle/data/dependencies.qml
+++ b/tests/auto/quickcontrols2/qquickstyle/data/dependencies.qml
diff --git a/tests/auto/qquickstyle/data/designer/ButtonSpecifics.qml b/tests/auto/quickcontrols2/qquickstyle/data/designer/ButtonSpecifics.qml
index 21226ed2..21226ed2 100644
--- a/tests/auto/qquickstyle/data/designer/ButtonSpecifics.qml
+++ b/tests/auto/quickcontrols2/qquickstyle/data/designer/ButtonSpecifics.qml
diff --git a/tests/auto/qquickstyle/data/dummy.dSYM/empty b/tests/auto/quickcontrols2/qquickstyle/data/dummy.dSYM/empty
index e69de29b..e69de29b 100644
--- a/tests/auto/qquickstyle/data/dummy.dSYM/empty
+++ b/tests/auto/quickcontrols2/qquickstyle/data/dummy.dSYM/empty
diff --git a/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml b/tests/auto/quickcontrols2/qquickstyle/data/dummyStyles/DummyStyle/Button.qml
index dcacc011..dcacc011 100644
--- a/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml
+++ b/tests/auto/quickcontrols2/qquickstyle/data/dummyStyles/DummyStyle/Button.qml
diff --git a/tests/auto/qquickstyle/data/fusion.conf b/tests/auto/quickcontrols2/qquickstyle/data/fusion.conf
index 1f343e65..1f343e65 100644
--- a/tests/auto/qquickstyle/data/fusion.conf
+++ b/tests/auto/quickcontrols2/qquickstyle/data/fusion.conf
diff --git a/tests/auto/qquickstyle/data/imagine.conf b/tests/auto/quickcontrols2/qquickstyle/data/imagine.conf
index 919bbcf0..919bbcf0 100644
--- a/tests/auto/qquickstyle/data/imagine.conf
+++ b/tests/auto/quickcontrols2/qquickstyle/data/imagine.conf
diff --git a/tests/auto/qquickstyle/data/material.conf b/tests/auto/quickcontrols2/qquickstyle/data/material.conf
index 27c7931a..27c7931a 100644
--- a/tests/auto/qquickstyle/data/material.conf
+++ b/tests/auto/quickcontrols2/qquickstyle/data/material.conf
diff --git a/tests/auto/qquickstyle/data/universal.conf b/tests/auto/quickcontrols2/qquickstyle/data/universal.conf
index a5ac3ca3..a5ac3ca3 100644
--- a/tests/auto/qquickstyle/data/universal.conf
+++ b/tests/auto/quickcontrols2/qquickstyle/data/universal.conf
diff --git a/tests/auto/qquickstyle/tst_qquickstyle.cpp b/tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle.cpp
index 97259051..97259051 100644
--- a/tests/auto/qquickstyle/tst_qquickstyle.cpp
+++ b/tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle.cpp
diff --git a/tests/auto/qquickuniversalstyle/CMakeLists.txt b/tests/auto/quickcontrols2/qquickuniversalstyle/CMakeLists.txt
index 43d4c10d..43d4c10d 100644
--- a/tests/auto/qquickuniversalstyle/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickuniversalstyle/CMakeLists.txt
diff --git a/tests/auto/qquickuniversalstyle/data/tst_universal.qml b/tests/auto/quickcontrols2/qquickuniversalstyle/data/tst_universal.qml
index 356df731..356df731 100644
--- a/tests/auto/qquickuniversalstyle/data/tst_universal.qml
+++ b/tests/auto/quickcontrols2/qquickuniversalstyle/data/tst_universal.qml
diff --git a/tests/auto/qquickuniversalstyle/qtquickcontrols2.conf b/tests/auto/quickcontrols2/qquickuniversalstyle/qtquickcontrols2.conf
index 8c6dd807..8c6dd807 100644
--- a/tests/auto/qquickuniversalstyle/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols2/qquickuniversalstyle/qtquickcontrols2.conf
diff --git a/tests/auto/qquickuniversalstyle/tst_qquickuniversalstyle.cpp b/tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle.cpp
index c5b6b566..c5b6b566 100644
--- a/tests/auto/qquickuniversalstyle/tst_qquickuniversalstyle.cpp
+++ b/tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle.cpp
diff --git a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt
index 6aeeaa32..f3ce48a3 100644
--- a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickuniversalstyleconf
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickuniversalstyleconf.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml b/tests/auto/quickcontrols2/qquickuniversalstyleconf/data/applicationwindow.qml
index bb16254a..bb16254a 100644
--- a/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols2/qquickuniversalstyleconf/data/applicationwindow.qml
diff --git a/tests/auto/qquickuniversalstyleconf/qquickuniversalstyleconf.qrc b/tests/auto/quickcontrols2/qquickuniversalstyleconf/qquickuniversalstyleconf.qrc
index 53ba6450..53ba6450 100644
--- a/tests/auto/qquickuniversalstyleconf/qquickuniversalstyleconf.qrc
+++ b/tests/auto/quickcontrols2/qquickuniversalstyleconf/qquickuniversalstyleconf.qrc
diff --git a/tests/auto/qquickuniversalstyleconf/qtquickcontrols2.conf b/tests/auto/quickcontrols2/qquickuniversalstyleconf/qtquickcontrols2.conf
index 0ec13258..0ec13258 100644
--- a/tests/auto/qquickuniversalstyleconf/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols2/qquickuniversalstyleconf/qtquickcontrols2.conf
diff --git a/tests/auto/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp b/tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp
index bef3b1cd..bef3b1cd 100644
--- a/tests/auto/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp
+++ b/tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp
diff --git a/tests/auto/revisions/CMakeLists.txt b/tests/auto/quickcontrols2/revisions/CMakeLists.txt
index 79a0f8e3..79a0f8e3 100644
--- a/tests/auto/revisions/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/revisions/CMakeLists.txt
diff --git a/tests/auto/revisions/data/dependencies.qml b/tests/auto/quickcontrols2/revisions/data/dependencies.qml
index bb954219..bb954219 100644
--- a/tests/auto/revisions/data/dependencies.qml
+++ b/tests/auto/quickcontrols2/revisions/data/dependencies.qml
diff --git a/tests/auto/revisions/tst_revisions.cpp b/tests/auto/quickcontrols2/revisions/tst_revisions.cpp
index 0d4518cc..0d4518cc 100644
--- a/tests/auto/revisions/tst_revisions.cpp
+++ b/tests/auto/quickcontrols2/revisions/tst_revisions.cpp
diff --git a/tests/auto/sanity/BLACKLIST b/tests/auto/quickcontrols2/sanity/BLACKLIST
index 214c6e7c..214c6e7c 100644
--- a/tests/auto/sanity/BLACKLIST
+++ b/tests/auto/quickcontrols2/sanity/BLACKLIST
diff --git a/tests/auto/sanity/CMakeLists.txt b/tests/auto/quickcontrols2/sanity/CMakeLists.txt
index 804640b7..cbd3e2cc 100644
--- a/tests/auto/sanity/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/sanity/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_sanity
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_sanity.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/sanity/data/dependencies.qml b/tests/auto/quickcontrols2/sanity/data/dependencies.qml
index 280cfd29..280cfd29 100644
--- a/tests/auto/sanity/data/dependencies.qml
+++ b/tests/auto/quickcontrols2/sanity/data/dependencies.qml
diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/quickcontrols2/sanity/tst_sanity.cpp
index a19319b3..9678990d 100644
--- a/tests/auto/sanity/tst_sanity.cpp
+++ b/tests/auto/quickcontrols2/sanity/tst_sanity.cpp
@@ -46,7 +46,7 @@
 #include <QtQml/private/qqmljsast_p.h>
 #include <QtQml/private/qqmljsastvisitor_p.h>
 #include <QtQml/private/qqmlmetatype_p.h>
-#include "../../auto/shared/visualtestutil.h"
+#include "../../../auto/quickcontrols2/shared/visualtestutil.h"
 
 using namespace QQuickVisualTestUtil;
 
diff --git a/tests/auto/shared/dialogtestutil.h b/tests/auto/quickcontrols2/shared/dialogtestutil.h
index c10c4001..c10c4001 100644
--- a/tests/auto/shared/dialogtestutil.h
+++ b/tests/auto/quickcontrols2/shared/dialogtestutil.h
diff --git a/tests/auto/shared/qtest_quickcontrols.h b/tests/auto/quickcontrols2/shared/qtest_quickcontrols.h
index 8eadd979..8eadd979 100644
--- a/tests/auto/shared/qtest_quickcontrols.h
+++ b/tests/auto/quickcontrols2/shared/qtest_quickcontrols.h
diff --git a/tests/auto/shared/util.cpp b/tests/auto/quickcontrols2/shared/util.cpp
index 31647d69..31647d69 100644
--- a/tests/auto/shared/util.cpp
+++ b/tests/auto/quickcontrols2/shared/util.cpp
diff --git a/tests/auto/shared/util.h b/tests/auto/quickcontrols2/shared/util.h
index 50d161e0..50d161e0 100644
--- a/tests/auto/shared/util.h
+++ b/tests/auto/quickcontrols2/shared/util.h
diff --git a/tests/auto/shared/util.pri b/tests/auto/quickcontrols2/shared/util.pri
index 6366776b..6366776b 100644
--- a/tests/auto/shared/util.pri
+++ b/tests/auto/quickcontrols2/shared/util.pri
diff --git a/tests/auto/shared/visualtestutil.cpp b/tests/auto/quickcontrols2/shared/visualtestutil.cpp
index ff0d9e8e..ff0d9e8e 100644
--- a/tests/auto/shared/visualtestutil.cpp
+++ b/tests/auto/quickcontrols2/shared/visualtestutil.cpp
diff --git a/tests/auto/shared/visualtestutil.h b/tests/auto/quickcontrols2/shared/visualtestutil.h
index 142aefd2..142aefd2 100644
--- a/tests/auto/shared/visualtestutil.h
+++ b/tests/auto/quickcontrols2/shared/visualtestutil.h
diff --git a/tests/auto/snippets/CMakeLists.txt b/tests/auto/quickcontrols2/snippets/CMakeLists.txt
index a8d02b7d..1d8ac116 100644
--- a/tests/auto/snippets/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/snippets/CMakeLists.txt
@@ -14,7 +14,7 @@ qt_internal_add_test(tst_snippets
     SOURCES
         tst_snippets.cpp
     DEFINES
-        QQC2_SNIPPETS_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/quickcontrols2/doc/snippets\\\"
+        QQC2_SNIPPETS_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2/doc/snippets\\\"
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Quick
diff --git a/tests/auto/snippets/data/dependencies.qml b/tests/auto/quickcontrols2/snippets/data/dependencies.qml
index 8785d0b0..8785d0b0 100644
--- a/tests/auto/snippets/data/dependencies.qml
+++ b/tests/auto/quickcontrols2/snippets/data/dependencies.qml
diff --git a/tests/auto/snippets/qtquickcontrols2.conf b/tests/auto/quickcontrols2/snippets/qtquickcontrols2.conf
index bd157776..bd157776 100644
--- a/tests/auto/snippets/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols2/snippets/qtquickcontrols2.conf
diff --git a/tests/auto/snippets/tst_snippets.cpp b/tests/auto/quickcontrols2/snippets/tst_snippets.cpp
index 17ae6aa6..17ae6aa6 100644
--- a/tests/auto/snippets/tst_snippets.cpp
+++ b/tests/auto/quickcontrols2/snippets/tst_snippets.cpp
diff --git a/tests/auto/styleimports/CMakeLists.txt b/tests/auto/quickcontrols2/styleimports/CMakeLists.txt
index ee626ac5..9e612bc7 100644
--- a/tests/auto/styleimports/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/styleimports/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_styleimports
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_styleimports.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/styleimports/ResourceStyle/Button.qml b/tests/auto/quickcontrols2/styleimports/ResourceStyle/Button.qml
index 656b27a7..656b27a7 100644
--- a/tests/auto/styleimports/ResourceStyle/Button.qml
+++ b/tests/auto/quickcontrols2/styleimports/ResourceStyle/Button.qml
diff --git a/tests/auto/styleimports/data/Action.qml b/tests/auto/quickcontrols2/styleimports/data/Action.qml
index f49c6ff4..f49c6ff4 100644
--- a/tests/auto/styleimports/data/Action.qml
+++ b/tests/auto/quickcontrols2/styleimports/data/Action.qml
diff --git a/tests/auto/styleimports/data/Button.qml b/tests/auto/quickcontrols2/styleimports/data/Button.qml
index 85367472..85367472 100644
--- a/tests/auto/styleimports/data/Button.qml
+++ b/tests/auto/quickcontrols2/styleimports/data/Button.qml
diff --git a/tests/auto/styleimports/data/FileSystemStyle/Button.qml b/tests/auto/quickcontrols2/styleimports/data/FileSystemStyle/Button.qml
index a5078b14..a5078b14 100644
--- a/tests/auto/styleimports/data/FileSystemStyle/Button.qml
+++ b/tests/auto/quickcontrols2/styleimports/data/FileSystemStyle/Button.qml
diff --git a/tests/auto/styleimports/data/FileSystemStyle/qmldir b/tests/auto/quickcontrols2/styleimports/data/FileSystemStyle/qmldir
index 3c401588..3c401588 100644
--- a/tests/auto/styleimports/data/FileSystemStyle/qmldir
+++ b/tests/auto/quickcontrols2/styleimports/data/FileSystemStyle/qmldir
diff --git a/tests/auto/styleimports/data/Label.qml b/tests/auto/quickcontrols2/styleimports/data/Label.qml
index 3959dae8..3959dae8 100644
--- a/tests/auto/styleimports/data/Label.qml
+++ b/tests/auto/quickcontrols2/styleimports/data/Label.qml
diff --git a/tests/auto/styleimports/data/PlatformStyle/+linux/Button.qml b/tests/auto/quickcontrols2/styleimports/data/PlatformStyle/+linux/Button.qml
index 15c04d77..15c04d77 100644
--- a/tests/auto/styleimports/data/PlatformStyle/+linux/Button.qml
+++ b/tests/auto/quickcontrols2/styleimports/data/PlatformStyle/+linux/Button.qml
diff --git a/tests/auto/styleimports/data/PlatformStyle/+macos/Button.qml b/tests/auto/quickcontrols2/styleimports/data/PlatformStyle/+macos/Button.qml
index 6c07ec02..6c07ec02 100644
--- a/tests/auto/styleimports/data/PlatformStyle/+macos/Button.qml
+++ b/tests/auto/quickcontrols2/styleimports/data/PlatformStyle/+macos/Button.qml
diff --git a/tests/auto/styleimports/data/PlatformStyle/+windows/Button.qml b/tests/auto/quickcontrols2/styleimports/data/PlatformStyle/+windows/Button.qml
index 6a94679c..6a94679c 100644
--- a/tests/auto/styleimports/data/PlatformStyle/+windows/Button.qml
+++ b/tests/auto/quickcontrols2/styleimports/data/PlatformStyle/+windows/Button.qml
diff --git a/tests/auto/styleimports/data/PlatformStyle/Button.qml b/tests/auto/quickcontrols2/styleimports/data/PlatformStyle/Button.qml
index fce35efd..fce35efd 100644
--- a/tests/auto/styleimports/data/PlatformStyle/Button.qml
+++ b/tests/auto/quickcontrols2/styleimports/data/PlatformStyle/Button.qml
diff --git a/tests/auto/styleimports/data/PlatformStyle/qmldir b/tests/auto/quickcontrols2/styleimports/data/PlatformStyle/qmldir
index ce254517..ce254517 100644
--- a/tests/auto/styleimports/data/PlatformStyle/qmldir
+++ b/tests/auto/quickcontrols2/styleimports/data/PlatformStyle/qmldir
diff --git a/tests/auto/styleimports/data/applicationWindowWithButton.qml b/tests/auto/quickcontrols2/styleimports/data/applicationWindowWithButton.qml
index ba6af22c..ba6af22c 100644
--- a/tests/auto/styleimports/data/applicationWindowWithButton.qml
+++ b/tests/auto/quickcontrols2/styleimports/data/applicationWindowWithButton.qml
diff --git a/tests/auto/styleimports/data/qmldir b/tests/auto/quickcontrols2/styleimports/data/qmldir
index 9e9df940..9e9df940 100644
--- a/tests/auto/styleimports/data/qmldir
+++ b/tests/auto/quickcontrols2/styleimports/data/qmldir
diff --git a/tests/auto/styleimports/resources/ResourceStyle/Button.qml b/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/Button.qml
index 3a97e9de..3a97e9de 100644
--- a/tests/auto/styleimports/resources/ResourceStyle/Button.qml
+++ b/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/Button.qml
diff --git a/tests/auto/styleimports/resources/ResourceStyle/qmldir b/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/qmldir
index 4cb1a835..4cb1a835 100644
--- a/tests/auto/styleimports/resources/ResourceStyle/qmldir
+++ b/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/qmldir
diff --git a/tests/auto/styleimports/tst_styleimports.cpp b/tests/auto/quickcontrols2/styleimports/tst_styleimports.cpp
index fe5148ed..fe5148ed 100644
--- a/tests/auto/styleimports/tst_styleimports.cpp
+++ b/tests/auto/quickcontrols2/styleimports/tst_styleimports.cpp
diff --git a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt b/tests/auto/quickcontrols2/styleimportscompiletimematerial/CMakeLists.txt
index 8ea0508b..0861ffa2 100644
--- a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/styleimportscompiletimematerial/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_styleimportscompiletimematerial
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_styleimportscompiletimematerial.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml b/tests/auto/quickcontrols2/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml
index 7cb4fd58..7cb4fd58 100644
--- a/tests/auto/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml
+++ b/tests/auto/quickcontrols2/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml
diff --git a/tests/auto/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp b/tests/auto/quickcontrols2/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp
index c0f88b31..c0f88b31 100644
--- a/tests/auto/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp
+++ b/tests/auto/quickcontrols2/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp
diff --git a/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/CMakeLists.txt
index 40dc8dca..d4bb0c1b 100644
--- a/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_styleimportscompiletimeqmlonly
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_styleimportscompiletimeqmlonly.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml
index 73d94c1c..73d94c1c 100644
--- a/tests/auto/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml
+++ b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml
diff --git a/tests/auto/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir
index 5e60f095..5e60f095 100644
--- a/tests/auto/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir
+++ b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir
diff --git a/tests/auto/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml
index 027d5636..027d5636 100644
--- a/tests/auto/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml
+++ b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml
diff --git a/tests/auto/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp
index 7fd41ed9..7fd41ed9 100644
--- a/tests/auto/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp
+++ b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp
diff --git a/tests/auto/translation/CMakeLists.txt b/tests/auto/quickcontrols2/translation/CMakeLists.txt
index 9a2a1bf1..efb0ab6e 100644
--- a/tests/auto/translation/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/translation/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_translation
         ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_translation.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/translation/data/comboBox.qml b/tests/auto/quickcontrols2/translation/data/comboBox.qml
index cba1cf0c..cba1cf0c 100644
--- a/tests/auto/translation/data/comboBox.qml
+++ b/tests/auto/quickcontrols2/translation/data/comboBox.qml
diff --git a/tests/auto/translation/data/dialogButtonBox.qml b/tests/auto/quickcontrols2/translation/data/dialogButtonBox.qml
index fd8f9548..fd8f9548 100644
--- a/tests/auto/translation/data/dialogButtonBox.qml
+++ b/tests/auto/quickcontrols2/translation/data/dialogButtonBox.qml
diff --git a/tests/auto/translation/data/dialogButtonBoxWithCustomButtons.qml b/tests/auto/quickcontrols2/translation/data/dialogButtonBoxWithCustomButtons.qml
index bf0fb512..bf0fb512 100644
--- a/tests/auto/translation/data/dialogButtonBoxWithCustomButtons.qml
+++ b/tests/auto/quickcontrols2/translation/data/dialogButtonBoxWithCustomButtons.qml
diff --git a/tests/auto/translation/qml_jp.qm b/tests/auto/quickcontrols2/translation/qml_jp.qm
index a3712e99..a3712e99 100644
--- a/tests/auto/translation/qml_jp.qm
+++ b/tests/auto/quickcontrols2/translation/qml_jp.qm
diff --git a/tests/auto/translation/qml_jp.ts b/tests/auto/quickcontrols2/translation/qml_jp.ts
index 303c142f..303c142f 100644
--- a/tests/auto/translation/qml_jp.ts
+++ b/tests/auto/quickcontrols2/translation/qml_jp.ts
diff --git a/tests/auto/translation/qtbase_fr.qm b/tests/auto/quickcontrols2/translation/qtbase_fr.qm
index 176675a8..176675a8 100644
--- a/tests/auto/translation/qtbase_fr.qm
+++ b/tests/auto/quickcontrols2/translation/qtbase_fr.qm
diff --git a/tests/auto/translation/qtbase_fr.ts b/tests/auto/quickcontrols2/translation/qtbase_fr.ts
index 7aff8bd7..7aff8bd7 100644
--- a/tests/auto/translation/qtbase_fr.ts
+++ b/tests/auto/quickcontrols2/translation/qtbase_fr.ts
diff --git a/tests/auto/translation/tst_translation.cpp b/tests/auto/quickcontrols2/translation/tst_translation.cpp
index 58ce86cc..58ce86cc 100644
--- a/tests/auto/translation/tst_translation.cpp
+++ b/tests/auto/quickcontrols2/translation/tst_translation.cpp
diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt
index 3f2bf2f9..b0df947d 100644
--- a/tests/benchmarks/CMakeLists.txt
+++ b/tests/benchmarks/CMakeLists.txt
@@ -1,4 +1 @@
-# Generated from benchmarks.pro.
-
-add_subdirectory(creationtime)
-add_subdirectory(objectcount)
+add_subdirectory(quickcontrols2)
diff --git a/tests/benchmarks/quickcontrols2/CMakeLists.txt b/tests/benchmarks/quickcontrols2/CMakeLists.txt
new file mode 100644
index 00000000..3f2bf2f9
--- /dev/null
+++ b/tests/benchmarks/quickcontrols2/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from benchmarks.pro.
+
+add_subdirectory(creationtime)
+add_subdirectory(objectcount)
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/quickcontrols2/benchmarks.pro
index 7c4ca224..7c4ca224 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/quickcontrols2/benchmarks.pro
diff --git a/tests/benchmarks/creationtime/CMakeLists.txt b/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt
index 51880533..384eb701 100644
--- a/tests/benchmarks/creationtime/CMakeLists.txt
+++ b/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt
@@ -6,12 +6,12 @@
 
 qt_internal_add_test(tst_creationtime
     SOURCES
-        ../../auto/shared/qtest_quickcontrols.h
-        ../../auto/shared/util.cpp ../../auto/shared/util.h
-        ../../auto/shared/visualtestutil.cpp ../../auto/shared/visualtestutil.h
+        ../../../auto/quickcontrols2/shared/qtest_quickcontrols.h
+        ../../../auto/quickcontrols2/shared/util.cpp ../../../auto/quickcontrols2/shared/util.h
+        ../../../auto/quickcontrols2/shared/visualtestutil.cpp ../../../auto/quickcontrols2/shared/visualtestutil.h
         tst_creationtime.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/benchmarks/creationtime/creationtime.pro b/tests/benchmarks/quickcontrols2/creationtime/creationtime.pro
index 613cf60d..7d15ebd4 100644
--- a/tests/benchmarks/creationtime/creationtime.pro
+++ b/tests/benchmarks/quickcontrols2/creationtime/creationtime.pro
@@ -5,7 +5,7 @@ QT += qml testlib quickcontrols2
 CONFIG += testcase
 macos:CONFIG -= app_bundle
 
-include(../../auto/shared/util.pri)
+include(../../../auto/shared/util.pri)
 
 SOURCES += \
     tst_creationtime.cpp
diff --git a/tests/benchmarks/creationtime/data/dependencies.qml b/tests/benchmarks/quickcontrols2/creationtime/data/dependencies.qml
index 3b847617..3b847617 100644
--- a/tests/benchmarks/creationtime/data/dependencies.qml
+++ b/tests/benchmarks/quickcontrols2/creationtime/data/dependencies.qml
diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp
index f5383716..1c36ce8a 100644
--- a/tests/benchmarks/creationtime/tst_creationtime.cpp
+++ b/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp
@@ -39,7 +39,7 @@
 #include <QtQml>
 #include <QtQuickControls2/qquickstyle.h>
 
-#include "../../auto/shared/visualtestutil.h"
+#include "../../../auto/quickcontrols2/shared/visualtestutil.h"
 
 using namespace QQuickVisualTestUtil;
 
diff --git a/tests/benchmarks/objectcount/CMakeLists.txt b/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt
index 122842cd..d3c933a7 100644
--- a/tests/benchmarks/objectcount/CMakeLists.txt
+++ b/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt
@@ -6,12 +6,12 @@
 
 qt_internal_add_test(tst_objectcount
     SOURCES
-        ../../auto/shared/qtest_quickcontrols.h
-        ../../auto/shared/util.cpp ../../auto/shared/util.h
-        ../../auto/shared/visualtestutil.cpp ../../auto/shared/visualtestutil.h
+        ../../../auto/quickcontrols2/shared/qtest_quickcontrols.h
+        ../../../auto/quickcontrols2/shared/util.cpp ../../../auto/quickcontrols2/shared/util.h
+        ../../../auto/quickcontrols2/shared/visualtestutil.cpp ../../../auto/quickcontrols2/shared/visualtestutil.h
         tst_objectcount.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/benchmarks/objectcount/data/dependencies.qml b/tests/benchmarks/quickcontrols2/objectcount/data/dependencies.qml
index 3b847617..3b847617 100644
--- a/tests/benchmarks/objectcount/data/dependencies.qml
+++ b/tests/benchmarks/quickcontrols2/objectcount/data/dependencies.qml
diff --git a/tests/benchmarks/objectcount/objectcount.pro b/tests/benchmarks/quickcontrols2/objectcount/objectcount.pro
index 046bfc45..f2f2879a 100644
--- a/tests/benchmarks/objectcount/objectcount.pro
+++ b/tests/benchmarks/quickcontrols2/objectcount/objectcount.pro
@@ -5,7 +5,7 @@ QT += quick testlib core-private
 CONFIG += testcase
 macos:CONFIG -= app_bundle
 
-include(../../auto/shared/util.pri)
+include(../../../auto/shared/util.pri)
 
 SOURCES += \
     tst_objectcount.cpp
diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp
index c8d29486..d7f1b0ef 100644
--- a/tests/benchmarks/objectcount/tst_objectcount.cpp
+++ b/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp
@@ -38,7 +38,7 @@
 #include <QtQuick>
 #include <QtCore/private/qhooks_p.h>
 #include <iostream>
-#include "../../auto/shared/visualtestutil.h"
+#include "../../../auto/quickcontrols2/shared/visualtestutil.h"
 
 using namespace QQuickVisualTestUtil;
 
diff --git a/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_abstractbutton.qml
index 87b137fb..87b137fb 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_abstractbutton.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_busyindicator.qml
index bc0be402..bc0be402 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_busyindicator.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_button.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_button.qml
index 9505ebf0..9505ebf0 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_button.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_button.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkbox.qml
index 67d9e382..67d9e382 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkbox.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkdelegate.qml
index bd7b64cc..bd7b64cc 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_checkdelegate.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_combobox.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_combobox.qml
index f8552b74..f8552b74 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_combobox.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_combobox.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_container.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_container.qml
index 238e95e3..238e95e3 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_container.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_container.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_control.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_control.qml
index 20f09477..20f09477 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_control.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_control.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_delaybutton.qml
index 05ec8748..05ec8748 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_delaybutton.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_dial.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dial.qml
index de742c7b..de742c7b 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_dial.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dial.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_dialog.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialog.qml
index 686149f7..686149f7 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_dialog.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialog.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialogbuttonbox.qml
index f13d65c5..f13d65c5 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_dialogbuttonbox.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_drawer.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_drawer.qml
index 3f7290a4..3f7290a4 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_drawer.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_drawer.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_frame.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_frame.qml
index 2d3c9a66..2d3c9a66 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_frame.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_frame.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_groupbox.qml
index 3696f847..3696f847 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_groupbox.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_itemdelegate.qml
index 07128da1..07128da1 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_itemdelegate.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_label.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_label.qml
index 788006a4..788006a4 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_label.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_label.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_menu.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menu.qml
index fd8e53b4..fd8e53b4 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_menu.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menu.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuitem.qml
index 6732bc18..6732bc18 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuitem.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuseparator.qml
index 8effa173..8effa173 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_menuseparator.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_page.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_page.qml
index f9d06b38..f9d06b38 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_page.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_page.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pageindicator.qml
index 9b5a6918..9b5a6918 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pageindicator.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_pane.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pane.qml
index a391f695..a391f695 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_pane.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_pane.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_popup.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_popup.qml
index c2cdaab5..c2cdaab5 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_popup.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_popup.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_progressbar.qml
index d50d9d26..d50d9d26 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_progressbar.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiobutton.qml
index f596e852..f596e852 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiobutton.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiodelegate.qml
index 7f573466..7f573466 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_radiodelegate.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_rangeslider.qml
index 725cab29..725cab29 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_rangeslider.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_roundbutton.qml
index 0337a66d..0337a66d 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_roundbutton.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollbar.qml
index 2635240f..2635240f 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollbar.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollindicator.qml
index 4e2b90a3..4e2b90a3 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollindicator.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollview.qml
index b5f155cb..b5f155cb 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_scrollview.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_slider.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_slider.qml
index 0ef3b3fa..0ef3b3fa 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_slider.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_slider.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_spinbox.qml
index 9120a921..9120a921 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_spinbox.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_stackview.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_stackview.qml
index cb6cee10..cb6cee10 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_stackview.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_stackview.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipedelegate.qml
index 5147bbb6..5147bbb6 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipedelegate.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipeview.qml
index b263e620..b263e620 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_swipeview.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_switch.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switch.qml
index 79cc48e3..79cc48e3 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_switch.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switch.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switchdelegate.qml
index f6f8a7df..f6f8a7df 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_switchdelegate.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbar.qml
index 37f6a463..37f6a463 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbar.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbutton.qml
index 27442a7d..27442a7d 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tabbutton.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_textarea.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textarea.qml
index 88454c0b..88454c0b 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_textarea.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textarea.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_textfield.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textfield.qml
index eb279724..eb279724 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_textfield.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_textfield.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolbutton.qml
index 7dcd85a3..7dcd85a3 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolbutton.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolseparator.qml
index 48cdd352..48cdd352 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_toolseparator.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tooltip.qml
index 85e86494..85e86494 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tooltip.qml
diff --git a/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tumbler.qml
index da747e23..da747e23 100644
--- a/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml
+++ b/tests/benchmarks/quickcontrols2/qmlbench/creation/delegates_tumbler.qml
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index ca545da7..b0df947d 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 00000000..4587ecf1
--- /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 ecbf637b..ecbf637b 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 57f80c88..57f80c88 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 0272522a..0272522a 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 2cb1c14c..2cb1c14c 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 26969440..26969440 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 cc132f36..cc132f36 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 9faad47e..9faad47e 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 5b5d1034..5b5d1034 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 4a229404..4a229404 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 8114f14e..8114f14e 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 8bab70e2..8bab70e2 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 7dc1b8fd..7dc1b8fd 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 6e64659e..6e64659e 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 4f4a6b7b..4f4a6b7b 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 6160ff11..6160ff11 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 c89af25a..c89af25a 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 36e70f7e..36e70f7e 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 43e58bdd..43e58bdd 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 8d3464a0..8d3464a0 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 0ff3892d..0ff3892d 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 a2fc5355..a2fc5355 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 cec5e97a..cec5e97a 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 28ed510a..28ed510a 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 37dc5c7f..37dc5c7f 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 dd07926f..dd07926f 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 4af50d6b..4af50d6b 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 8336855c..8336855c 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 b0bee6cd..b0bee6cd 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 46cdc073..46cdc073 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 585aea27..585aea27 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 704a0601..704a0601 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 274f2efe..274f2efe 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 8eaa3df2..8eaa3df2 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 3b9b1466..3b9b1466 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 317d81d2..317d81d2 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 32efcba8..32efcba8 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 1ef9e2c0..1ef9e2c0 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 80f2c86d..80f2c86d 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 4679ea03..4679ea03 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 994af450..994af450 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 fec7ec9b..fec7ec9b 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 a00f3209..a00f3209 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 c648f998..c648f998 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 cc4d6dc2..cc4d6dc2 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 e838673a..e838673a 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 be23df3b..be23df3b 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 26066770..26066770 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 83f652aa..83f652aa 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 7ddd8db8..7ddd8db8 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 88229fce..88229fce 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 59885745..59885745 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 a7435d2a..a7435d2a 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 0b18c6a3..0b18c6a3 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 789fb86f..789fb86f 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 c78fc6d4..c78fc6d4 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 9004ff18..9004ff18 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 a9497bde..a9497bde 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 1caece5b..1caece5b 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 a973cef8..a973cef8 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 bfad311e..bfad311e 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 ad88b1db..ad88b1db 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 ea01299f..ea01299f 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 4bc7c9cd..4bc7c9cd 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 30d06b11..30d06b11 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 a5bb72c7..a5bb72c7 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 80c3fd9f..80c3fd9f 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 4c4ae94a..4c4ae94a 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 474cc921..474cc921 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 a11f8627..a11f8627 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 abce1c00..abce1c00 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 27ec27f1..27ec27f1 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 fab7372d..fab7372d 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 d5eb2a9c..d5eb2a9c 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 269d2301..269d2301 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 c24e9a54..c24e9a54 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 21dd5b09..21dd5b09 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 5ac9f6bb..5ac9f6bb 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 6a01faed..6a01faed 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 00dc7378..00dc7378 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 a51cca94..a51cca94 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 b0df77b6..b0df77b6 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 e2b045a5..e2b045a5 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 6ace8f20..6ace8f20 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 8a657cdd..8a657cdd 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 07319952..07319952 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 075c10d3..075c10d3 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 b6de2b57..b6de2b57 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 77e97b0c..77e97b0c 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 3e8ccd1e..3e8ccd1e 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 f0655f25..f0655f25 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 220f8d03..220f8d03 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 8abd076d..8abd076d 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 24a96b59..24a96b59 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 a5764c78..a5764c78 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 81afa26c..81afa26c 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 4c7610c4..4c7610c4 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 04c9cb24..04c9cb24 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 552f159b..552f159b 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 d8d49c02..d8d49c02 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 10e97da5..10e97da5 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 ee669b3a..ee669b3a 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 8d89eab8..8d89eab8 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 51c5601d..51c5601d 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 cc487531..cc487531 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 5e44118c..5e44118c 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 9c700430..9c700430 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 fba642e5..fba642e5 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 661a7dc7..661a7dc7 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 fb191c9f..fb191c9f 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 3a1533eb..3a1533eb 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 cd93d055..cd93d055 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 77863abe..77863abe 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 aee7655b..aee7655b 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 41bf6ab7..41bf6ab7 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 53f380bf..53f380bf 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 b6bd2926..b6bd2926 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 d2081db1..d2081db1 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 e4e1844d..e4e1844d 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 5894888f..5894888f 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 3496b32b..3496b32b 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 681bdd4d..681bdd4d 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 d64176b4..d64176b4 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 74e7c5da..74e7c5da 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 3cb55667..3cb55667 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 8dbb3421..8dbb3421 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 ab62046c..84d8460a 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 061ecfa0..061ecfa0 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 0f70e6b8..0f70e6b8 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 d665d613..d665d613 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 2faa9fba..2faa9fba 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 0f400c0d..0f400c0d 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 7ba6c733..7ba6c733 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 a0f0de7b..a0f0de7b 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 060ab4f7..060ab4f7 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 83bd9b34..83bd9b34 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 b44a4496..b44a4496 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 a7b16ba4..a7b16ba4 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 1866a269..1866a269 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 24b9caa0..24b9caa0 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 d44bc83b..d44bc83b 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 656476d9..656476d9 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 a8e49b07..a8e49b07 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 3e1cad86..3e1cad86 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 7ea9619e..7ea9619e 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 9587e0d4..9587e0d4 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 b1b32894..b1b32894 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 75fae8bc..75fae8bc 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 3c6785c9..3c6785c9 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 66933a92..66933a92 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 2723f33d..2723f33d 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 0a8c2f82..0a8c2f82 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 4bd99bd3..4bd99bd3 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 32c4806a..32c4806a 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 903e52db..903e52db 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 377cc3a0..377cc3a0 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 bd434de6..bd434de6 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 d11b5bea..d11b5bea 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 90cbc195..90cbc195 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 4813dac5..4813dac5 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 4af9ccf4..4af9ccf4 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 1daebfc9..1daebfc9 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 a21dd9c6..a21dd9c6 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 cc0f4518..cc0f4518 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 ac57453f..ac57453f 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 0598dae8..0598dae8 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 8f546384..8f546384 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 75fb7701..75fb7701 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 c0f6faa2..c0f6faa2 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 16c99ec8..16c99ec8 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 0ea9d3be..0ea9d3be 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 dd88c3b8..dd88c3b8 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 80ced769..80ced769 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 0b887e2f..0b887e2f 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 d8155a20..d8155a20 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 ba15c052..ba15c052 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 f435c9a5..f435c9a5 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 3d310676..3d310676 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 5de29ef1..5de29ef1 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 b5329b71..b5329b71 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 bc2d9045..bc2d9045 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 7ca9bd0a..7ca9bd0a 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 ddafd14c..ddafd14c 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 71208fb8..71208fb8 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 fb2d1d43..fb2d1d43 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 4ed80f75..4ed80f75 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 d9ee487d..d9ee487d 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 21e751ac..21e751ac 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 22ca6cce..22ca6cce 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 f2801def..f2801def 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 13d0a443..13d0a443 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 6e877a49..6e877a49 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 4f60da55..4f60da55 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 a7a1de49..a7a1de49 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 dfe28f79..dfe28f79 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 1eed3a6c..1eed3a6c 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 3aba3377..3aba3377 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 ddcf92f8..ddcf92f8 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 a2dbebef..a2dbebef 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 c89af25a..c89af25a 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 d0d4cd8d..d0d4cd8d 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 a1650d86..a1650d86 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 fc86e031..fc86e031 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 8fa3da36..8fa3da36 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 49b6c5da..49b6c5da 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 ddad828f..ddad828f 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 82e69be6..82e69be6 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 4509f496..4509f496 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 8f0951ad..8f0951ad 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 f91b0d8c..f91b0d8c 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 b6b7a5ff..b6b7a5ff 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 5ac170b3..5ac170b3 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 649829d4..649829d4 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 5f6483ac..5f6483ac 100644
--- a/tests/manual/viewinqwidget/viewinqwidget.qrc
+++ b/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.qrc