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 6f2300117c..b0df947d89 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 0000000000..ef299bb77b
--- /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 fe7a87f847..fe7a87f847 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 596bf3b9bd..ba27a49741 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 29d6b3c0a0..29d6b3c0a0 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 baaa9ba80b..baaa9ba80b 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 0359b3ac15..0359b3ac15 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 c912be5791..c912be5791 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 df62bc89d5..df62bc89d5 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 bfeac723da..bfeac723da 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 7d29fec426..7d29fec426 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 280cfd2962..280cfd2962 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 d7e700b5df..d7e700b5df 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 d88fd36d8e..d88fd36d8e 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 60a35171b2..60a35171b2 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 b70ccb556c..b70ccb556c 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 24f3a294b8..24f3a294b8 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 5ec95fe07e..5ec95fe07e 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 5f6a98cd74..5f6a98cd74 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 07fef72849..07fef72849 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 194fa988c8..194fa988c8 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 cd1f78e170..cd1f78e170 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 d64d565706..d64d565706 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 765c98a394..765c98a394 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 c599bd4c0b..c599bd4c0b 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 b3e287c33c..b3e287c33c 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 d796b37e17..d796b37e17 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 d002b98532..d002b98532 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 7bd364c443..7bd364c443 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 6c78c0a47d..6c78c0a47d 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 c36b1534b1..c36b1534b1 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 5b2f44b674..5b2f44b674 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 fd60a19844..fd60a19844 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 159e1f4676..159e1f4676 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 bd540b91a0..bd540b91a0 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 d3724d4dc2..d3724d4dc2 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 9eb8221666..9eb8221666 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 00213086aa..00213086aa 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 9f71ed6848..9f71ed6848 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 423bfea903..423bfea903 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 ab9ea8ae2c..ab9ea8ae2c 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 9a1f31d029..9a1f31d029 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 42a16bae78..42a16bae78 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 01b93d7d91..01b93d7d91 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 40e1152edc..40e1152edc 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 f1c3cebee5..f1c3cebee5 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 e3db175bd2..e3db175bd2 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 8efafe3232..8efafe3232 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 ac8efe2601..ac8efe2601 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 439788d121..439788d121 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 578af86c78..578af86c78 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 5df735091e..5df735091e 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 43f65d5083..43f65d5083 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 fa6ed3b4bf..fa6ed3b4bf 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 4e73f341d6..4e73f341d6 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 9c2be4617f..9c2be4617f 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 8dbf0e3764..8dbf0e3764 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 d1f3197196..d1f3197196 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 02e973e2cc..02e973e2cc 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 55086b35c0..55086b35c0 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 d09d0845c9..d09d0845c9 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 2f32cb7514..2f32cb7514 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 5c1310f875..5c1310f875 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 57a1b3d61f..57a1b3d61f 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 e1c064f3b5..e1c064f3b5 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 b3b87e8ab6..b3b87e8ab6 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 f366464df7..f366464df7 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 7b57e9a9f5..7b57e9a9f5 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 9d8d58550a..9d8d58550a 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 58bd2ae1bd..58bd2ae1bd 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 3c555256b8..3c555256b8 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 883f963c5c..883f963c5c 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 675c34aad1..675c34aad1 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 a793ee2833..a793ee2833 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 6b3e613c42..6b3e613c42 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 5cc1e5d4b8..5cc1e5d4b8 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 9239f8db99..9239f8db99 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 327f2a6d4a..327f2a6d4a 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 dd3b8342f7..dd3b8342f7 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 bc97fc93bc..bc97fc93bc 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 809b536210..809b536210 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 18e3eb70ce..18e3eb70ce 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 0c66f9e9e9..0c66f9e9e9 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 a959f68cae..a959f68cae 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 1530a2d1bc..1530a2d1bc 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 2b1422252f..2b1422252f 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 42098b6640..42098b6640 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 97406f8ca5..97406f8ca5 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 5ecb427baf..5ecb427baf 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 1a4c3a994f..1a4c3a994f 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 947f66cd70..947f66cd70 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 f2cb8b60e6..f2cb8b60e6 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 1b41ce037f..1b41ce037f 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 4c7accb315..4c7accb315 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 fdac69d643..fdac69d643 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 07ba810c43..07ba810c43 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 db7b454b59..db7b454b59 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 21b78d6349..21b78d6349 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 0c6723dc54..0c6723dc54 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 9e80b76580..9e80b76580 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 476340700a..476340700a 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 55112e1e2c..63a3f1a4ff 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 f7d87422b5..f7d87422b5 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 95d7e36a38..95d7e36a38 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 40718c0910..40718c0910 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 df81269ce1..df81269ce1 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 c11b504b75..c11b504b75 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 a581c4327d..a581c4327d 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 0f9be0e929..0f9be0e929 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 0acac9eb22..0acac9eb22 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 6f9c6e0b67..6f9c6e0b67 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 2955aa61eb..2955aa61eb 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 00f8affdd2..00f8affdd2 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 eded64b119..eded64b119 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 e4ea5679da..e4ea5679da 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 9353c33828..9353c33828 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 a6ec4faad9..a6ec4faad9 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 138c0e2441..138c0e2441 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 81c3d6ca94..81c3d6ca94 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 70f1ae9dbf..70f1ae9dbf 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 5359f63c4a..5359f63c4a 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 be2b9a12ba..be2b9a12ba 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 4afa719ef6..4afa719ef6 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 731caf8675..731caf8675 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 2d0c702e70..2d0c702e70 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 b227d82e1b..b227d82e1b 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 706bf10dc1..706bf10dc1 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 95c691441f..95c691441f 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 ed7148978a..ed7148978a 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 7fa4e9e493..7fa4e9e493 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 d6efb1373a..d6efb1373a 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 713c030efd..713c030efd 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 ae78a12563..ae78a12563 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 765c52a77a..765c52a77a 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 d44d7424a6..d44d7424a6 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 145f555218..145f555218 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 2d26440927..2d26440927 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 42ef9a1547..42ef9a1547 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 87984b2c15..87984b2c15 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 5e4d715034..5e4d715034 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 d7a8832ca2..d7a8832ca2 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 f15983a943..f15983a943 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 5f6006d40e..5f6006d40e 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 46afa503ad..46afa503ad 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 13ddf00f95..13ddf00f95 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 d105473c38..d105473c38 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 6220a857b3..6220a857b3 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 b9ace27ee3..b9ace27ee3 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 a3df827ab0..a3df827ab0 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 7b4fdcd127..7b4fdcd127 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 68b91c3555..68b91c3555 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 7bd09399df..7bd09399df 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 a1ff9f4a3e..a1ff9f4a3e 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 3659a0abab..3659a0abab 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 3f8092099b..3f8092099b 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 7f0b52fc10..7f0b52fc10 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 f9b0587fa2..f9b0587fa2 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 b35a927d3e..b35a927d3e 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 a7acd05ae4..a7acd05ae4 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 41c161dd4b..41c161dd4b 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 2f98a5f3d2..2f98a5f3d2 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 3a09bd9fe9..3a09bd9fe9 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 476340700a..476340700a 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 03c52605e2..96d4fa5a85 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 f2e40e6059..f2e40e6059 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 7528ccea2b..7528ccea2b 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 476340700a..476340700a 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 faef2e0616..be47d59d0b 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 9a31141bff..9a31141bff 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 9db7ed4dc6..9db7ed4dc6 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 476340700a..476340700a 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 b8505b9bfa..7aa6c25dfc 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 8bcf03013c..8bcf03013c 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 ae8bb3a11e..ae8bb3a11e 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 476340700a..476340700a 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 5f9024cd4b..c009750e90 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 8ba71c8302..8ba71c8302 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 db5b560e01..db5b560e01 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 5f02758caa..d764836ef2 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 eb7e27cfa4..eb7e27cfa4 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 0e72297111..0e72297111 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 04bf4b7cb0..04bf4b7cb0 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 f71fbf7563..f71fbf7563 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 997abd4b65..997abd4b65 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 687450ec05..687450ec05 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 37a9e0c150..37a9e0c150 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 54e689f4c1..56bcaf1130 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 b30d4a5628..b30d4a5628 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 6a1f1b098b..6a1f1b098b 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 388de3af36..388de3af36 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 20426d2ede..20426d2ede 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 3d8b5a8e09..3d8b5a8e09 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 a0547ec418..a0547ec418 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 84cf6e35e4..84cf6e35e4 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 7519d7bd18..7519d7bd18 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 55a456c764..55a456c764 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 ce34f25f28..ce34f25f28 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 de83e56400..de83e56400 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 8b056a8833..8b056a8833 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 5ce5f504e1..5ce5f504e1 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 b4da57c000..b4da57c000 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 00f4d79c7a..00f4d79c7a 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 900770cdba..900770cdba 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 19de468d8a..19de468d8a 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 bfc4a83966..bfc4a83966 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 27b8a01431..27b8a01431 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 24f7c6edf4..24f7c6edf4 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 d66e899a49..d66e899a49 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 11f38a1b06..11f38a1b06 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 effd32c0ed..effd32c0ed 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 353fb9cc65..353fb9cc65 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 98976ae255..98976ae255 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 2429e2c6c1..2429e2c6c1 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 fdcb49ac8f..fdcb49ac8f 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 a2afa03bc4..a2afa03bc4 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 8776629230..8776629230 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 bbb711c7ed..bbb711c7ed 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 0043b40775..0043b40775 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 5b06801db8..5b06801db8 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 80a6782e34..80a6782e34 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 56c73cb8f4..56c73cb8f4 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 198936c2b5..198936c2b5 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 6cfa3e919b..6cfa3e919b 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 9e334ecf35..9e334ecf35 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 0a55abf812..0a55abf812 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 d05f1e9c5c..d05f1e9c5c 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 51b411aab9..51b411aab9 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 da00b0e872..da00b0e872 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 fe0a9f5222..fe0a9f5222 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 0f38b66077..0f38b66077 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 6ee896366b..6ee896366b 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 e2ee786690..e2ee786690 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 3fcf63d528..3fcf63d528 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 6696336d8f..6696336d8f 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 8d4ef1b58a..8d4ef1b58a 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 63985f7fdf..63985f7fdf 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 a1aff94132..a1aff94132 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 c8b3bfebb7..c8b3bfebb7 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 a5fcc4c7e5..a5fcc4c7e5 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 1c5bd31823..1c5bd31823 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 dc3f0db12c..dc3f0db12c 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 2deab67904..2deab67904 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 dc80508047..dc80508047 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 13f98af9b9..13f98af9b9 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 b0d8a8d2f7..b0d8a8d2f7 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 ff117ce812..ff117ce812 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 a282528d45..a282528d45 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 90229e4788..90229e4788 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 90f980eaec..90f980eaec 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 9260972c95..9260972c95 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 6392be7d7b..6392be7d7b 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 11c596a1b0..11c596a1b0 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 6b340f2adb..6b340f2adb 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 830ac584d0..830ac584d0 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 fffd44e8f6..fffd44e8f6 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 b04d2f59e8..b04d2f59e8 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 95d1f19180..95d1f19180 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 662392546b..662392546b 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 f815b73fac..f815b73fac 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 abf3be5db0..abf3be5db0 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 3a174ecfa1..3a174ecfa1 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 7ecb176b8c..7ecb176b8c 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 b24162476f..b24162476f 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 2370a334bf..2370a334bf 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 0dbf4b1c97..0dbf4b1c97 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 b6381170c1..b6381170c1 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 dc7d7658ef..dc7d7658ef 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 2b4a0b626c..2b4a0b626c 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 75cda63d60..75cda63d60 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 fab56fcdc9..fab56fcdc9 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 ec075db314..ec075db314 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 418f290884..418f290884 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 b427b757d7..b427b757d7 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 7f4e2c4079..7f4e2c4079 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 88c5b22fce..88c5b22fce 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 0c058269a5..0c058269a5 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 1bc5bf50f0..1bc5bf50f0 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 dadb54a5ea..dadb54a5ea 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 aa256d9908..aa256d9908 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 be10b52006..be10b52006 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 7205c973ee..7205c973ee 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 5d360cb1cf..5d360cb1cf 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 bc065b222d..bc065b222d 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 5667124028..5667124028 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 1fef7ab523..1fef7ab523 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 2061949cd2..2061949cd2 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 253391a8be..253391a8be 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 b8cf9daa1a..b8cf9daa1a 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 1ef95c9936..1ef95c9936 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 3bfdafc428..3bfdafc428 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 1ee2a92e11..1ee2a92e11 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 7e3710509b..7e3710509b 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 8fbdd1a4b6..8fbdd1a4b6 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 b046163e2d..b046163e2d 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 7daa248c07..7daa248c07 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 50bfa058cc..50bfa058cc 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 13c0e4729f..13c0e4729f 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 b0ff62578b..b0ff62578b 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 0ad81beaa3..0ad81beaa3 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 6f07f5da9c..6f07f5da9c 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 b6ab635bfd..b6ab635bfd 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 66600c63c2..66600c63c2 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 d8ab999e2e..d8ab999e2e 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 d7f954befe..d7f954befe 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 5dadbd7793..5dadbd7793 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 e447b5c2df..e447b5c2df 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 3597f1587d..3597f1587d 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 79334dcbd8..79334dcbd8 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 e60ea00c4d..e60ea00c4d 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 220d0038b9..220d0038b9 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 b782eb4d09..b782eb4d09 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 a979ecb7fa..a979ecb7fa 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 b14f9089a6..b14f9089a6 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 ba6d27ecea..ba6d27ecea 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 dbd29521ac..dbd29521ac 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 b18363407d..b18363407d 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 ecd7cbdf21..ecd7cbdf21 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 a3d7d8d5dc..a3d7d8d5dc 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 293fe25481..293fe25481 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 f17729f791..f17729f791 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 8dd08aea84..8dd08aea84 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 3a6ba580df..3a6ba580df 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 d51ef732f3..d51ef732f3 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 906a9847f8..906a9847f8 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 b34d40970d..b34d40970d 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 a120e05f97..a120e05f97 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 02b06d92e4..02b06d92e4 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 9ec62e016e..9ec62e016e 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 4108e16678..4108e16678 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 0da62d0fd9..0da62d0fd9 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 434f900361..434f900361 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 9f24763fa6..9f24763fa6 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 a33809c7df..a33809c7df 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 68e4f62700..68e4f62700 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 9ab619a934..9ab619a934 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 42f3d2fdeb..42f3d2fdeb 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 001d86b1c5..001d86b1c5 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 de0bdb392d..de0bdb392d 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 12b55b15a2..12b55b15a2 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 aa413dd093..aa413dd093 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 d2104f9eeb..d2104f9eeb 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 996af0d2cd..996af0d2cd 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 e8813bd518..e8813bd518 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 e8bf0b90f5..e8bf0b90f5 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 43b94010e6..43b94010e6 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 12418ff720..12418ff720 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 692c2fda2e..692c2fda2e 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 9830931b16..9830931b16 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 77cdf23d28..77cdf23d28 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 c3276dccdf..c3276dccdf 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 b732aefa7a..b732aefa7a 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 b4fefcf57b..b4fefcf57b 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 5ee03d57eb..5ee03d57eb 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 d452a58f31..d452a58f31 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 29e3d26d33..29e3d26d33 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 c79b9f815b..c79b9f815b 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 65aa625c00..65aa625c00 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 b31b70aa95..b31b70aa95 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 0d0bfbd9aa..0d0bfbd9aa 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 4a087c75aa..4a087c75aa 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 883cff743d..883cff743d 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 f551fae8fe..f551fae8fe 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 b7f54cfbac..b7f54cfbac 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 513b59ce87..513b59ce87 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 7f7f569a0e..7f7f569a0e 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 57a2db1517..57a2db1517 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 c51d1e7313..c51d1e7313 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 3d58299e1b..3d58299e1b 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 70a2944179..70a2944179 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 a63879bd26..a63879bd26 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 2a9e636ada..2a9e636ada 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 5bd5c721d0..5bd5c721d0 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 7fbe3833f1..7fbe3833f1 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 0f4cda9999..0f4cda9999 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 1a0b0e05e8..1a0b0e05e8 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 fc551710e2..fc551710e2 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 06497abb6e..06497abb6e 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 bc02c26583..bc02c26583 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 052c523be3..052c523be3 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 d074ec6372..d074ec6372 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 bc33d64bae..bc33d64bae 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 bb38737036..bb38737036 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 63646a0bbf..63646a0bbf 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 57a3f8049f..57a3f8049f 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 6b9986d8f6..6b9986d8f6 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 b3e03bddad..b3e03bddad 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 f2852f684f..f2852f684f 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 ad4a3c7b11..ad4a3c7b11 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 39bb695e34..39bb695e34 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 8af7238ee3..8af7238ee3 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 a9e285fb5c..a9e285fb5c 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 5c6b408d8a..5c6b408d8a 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 642d618400..642d618400 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 72d68f8a31..72d68f8a31 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 f15ba96ab3..f15ba96ab3 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 f8eaef0c25..f8eaef0c25 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 ec39193b43..ec39193b43 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 1dcebb9b7a..1dcebb9b7a 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 993c585bd9..993c585bd9 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 f4a95f0feb..f4a95f0feb 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 563db32945..563db32945 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 ed8613891b..ed8613891b 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 4a15009647..4a15009647 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 e083f8acb1..e083f8acb1 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 8f33c40156..8f33c40156 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 c1a9b50ba0..c1a9b50ba0 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 787acca9b3..787acca9b3 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 d7da32e0ad..d7da32e0ad 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 8239b1afca..8239b1afca 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 cbeb3c5dc5..cbeb3c5dc5 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 14dc33414d..14dc33414d 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 a22ec3aa39..a22ec3aa39 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 80b34723c7..80b34723c7 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 7538bd5b7e..7538bd5b7e 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 a38c876e9a..a38c876e9a 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 de9dc92911..de9dc92911 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 28d5998b22..28d5998b22 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 3df17b5825..3df17b5825 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 51ec606363..51ec606363 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 d508687f1c..d508687f1c 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 3b9e12b8c3..3b9e12b8c3 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 8b62fcade0..8b62fcade0 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 3f04e6b22a..3f04e6b22a 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 7ca5973bc3..7ca5973bc3 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 bc96ad47aa..bc96ad47aa 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 202688c48b..202688c48b 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 3547239f39..3547239f39 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 25bc3e09ec..25bc3e09ec 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 a901671bba..a901671bba 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 56334d841d..56334d841d 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 d5417404f0..d5417404f0 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 0facffad59..0facffad59 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 e16b9938bc..e16b9938bc 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 fec9f120fa..fec9f120fa 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 cf154b6b97..cf154b6b97 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 9e9613084a..9e9613084a 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 f7eb1d5c37..f7eb1d5c37 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 6b0f2b6327..6b0f2b6327 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 4c8a30ba81..4c8a30ba81 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 7e906433fe..7e906433fe 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 71a685349b..71a685349b 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 30bba195e4..30bba195e4 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 229b75368a..229b75368a 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 8ee00bc36c..8ee00bc36c 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 0299adf181..0299adf181 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 34f423c7eb..34f423c7eb 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 e5159885cb..e5159885cb 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 02c7597863..02c7597863 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 50331f8fef..50331f8fef 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 0f6598a600..0f6598a600 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 94485f87bf..94485f87bf 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 004641ec9e..004641ec9e 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 822b92dd19..822b92dd19 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 22e645466a..22e645466a 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 3cd526e3af..3cd526e3af 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 5010c4226b..5010c4226b 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 03cd61bc31..03cd61bc31 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 60657f5868..60657f5868 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 1e312fbc07..1e312fbc07 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 febad45ca6..febad45ca6 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 3f6e83d7fd..3f6e83d7fd 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 a8fe4c1592..a8fe4c1592 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 acabf6c554..acabf6c554 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 0250c64e61..0250c64e61 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 4979d473f3..4979d473f3 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 42f60f1b64..42f60f1b64 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 730d384475..730d384475 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 b9932df1b4..6ccf461bea 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 6b57f39b1e..6b57f39b1e 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 7ac8e014cd..7ac8e014cd 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 2f516be767..2f516be767 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 92df4665be..92df4665be 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 2f356eee61..219c6f6d38 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 9f82079e05..9f82079e05 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 9f2c34fe17..9f2c34fe17 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 8fcfc68612..8fcfc68612 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 48afa021cd..48afa021cd 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 e3983bf518..e3983bf518 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 77676baccf..77676baccf 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 896354dfb0..896354dfb0 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 7896a558e9..7896a558e9 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 eb534180a8..eb534180a8 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 0a4e5bc664..0a4e5bc664 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 0e799d47f0..0e799d47f0 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 058d5b8b95..058d5b8b95 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 429669c7b2..429669c7b2 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 cd2aebb55a..cd2aebb55a 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 7c37258519..7c37258519 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 976658b51e..976658b51e 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 a924fd1660..64aa3a1c92 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 215fb03497..215fb03497 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 896354dfb0..896354dfb0 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 7896a558e9..7896a558e9 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 eb534180a8..eb534180a8 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 0a4e5bc664..0a4e5bc664 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 0e799d47f0..0e799d47f0 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 058d5b8b95..058d5b8b95 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 429669c7b2..429669c7b2 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 cd2aebb55a..cd2aebb55a 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 eee6531f99..eee6531f99 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 95f9fde607..95f9fde607 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 9f2c34fe17..9f2c34fe17 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 7f3bfde575..7f3bfde575 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 48afa021cd..48afa021cd 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 6f35f452d2..6f35f452d2 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 77676baccf..77676baccf 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 2d0fe194ce..2d0fe194ce 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 c5de6b36dd..c5de6b36dd 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 d8e1a3bfdf..d8e1a3bfdf 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 6633de5c02..6633de5c02 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 12055a5ad6..12055a5ad6 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 5a63dd2390..5a63dd2390 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 37881c1aef..37881c1aef 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 edb62e5226..edb62e5226 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 7e38922255..7e38922255 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 0dd9eb91d6..0dd9eb91d6 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 0120832d05..0120832d05 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 117f79ce1a..117f79ce1a 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 52bb349fd3..52bb349fd3 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 23a5c821b2..23a5c821b2 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 1edc67a85a..1edc67a85a 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 09f1026175..09f1026175 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 129b0f43e4..129b0f43e4 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 926d446f82..926d446f82 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 280cfd2962..280cfd2962 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 1eb5eebc9a..1eb5eebc9a 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 1c346d15e6..d3d013acc0 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 ef69499025..ef69499025 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 07d783acee..07d783acee 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 d241d995f2..d241d995f2 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 738022e9e8..738022e9e8 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 bf8f61b756..bf8f61b756 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 4651c2fc78..4651c2fc78 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 082e2409cf..082e2409cf 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 ca8da3c23b..ca8da3c23b 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 f0abbb9a1e..f0abbb9a1e 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 6d4f37946e..6d4f37946e 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 670306fa41..670306fa41 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 243ce44089..243ce44089 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 d32725223e..d32725223e 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 f6bf7d74d8..f6bf7d74d8 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 2cbbe9eb8b..2cbbe9eb8b 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 cdd07e1481..cdd07e1481 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 94c6008053..94c6008053 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 3448a8c79c..dc35e0307d 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 0ac723207e..0ac723207e 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 8b38bf7bb7..8b38bf7bb7 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 9f3f96be8a..9f3f96be8a 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 812e4d2091..a3ab2bb2ff 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 a7c70e049b..a7c70e049b 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 8b8efb4846..8b8efb4846 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 449fbadb24..449fbadb24 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 3f2ed11897..3f2ed11897 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 6d2951f740..6d2951f740 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 b3f98d9e58..b3f98d9e58 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 bd1b84aa5b..bd1b84aa5b 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 dfd64ab1bd..dfd64ab1bd 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 03b69c4e63..03b69c4e63 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 d4d5fbd60d..d4d5fbd60d 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 e3211fab9f..e3211fab9f 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 b3db5a7b5b..b3db5a7b5b 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 d2aaf48601..d2aaf48601 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 02247dd030..02247dd030 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 e0b016cc1c..e0b016cc1c 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 e9c2eb422c..e9c2eb422c 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 4bd9c9d29c..4bd9c9d29c 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 2c7ec045fe..2c7ec045fe 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 9f428a4862..6a8f0fae5c 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 b8160a46dd..b8160a46dd 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 9bf9963c69..9bf9963c69 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 db2529cb0b..db2529cb0b 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 dbe810acf6..d11779bcd1 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 e6861520b9..e6861520b9 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 b44b43885c..b44b43885c 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 e6861520b9..e6861520b9 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 9b18a99e35..9b18a99e35 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 d457d205d5..d457d205d5 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 e6861520b9..e6861520b9 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 5e7ebefca4..5e7ebefca4 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 ed02d2df7a..ed02d2df7a 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 34fc6b339c..34fc6b339c 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 9f1b629074..9f1b629074 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 4dc3ac7588..4dc3ac7588 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 a54d998aa5..a54d998aa5 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 e29c23c5b2..e29c23c5b2 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 4674e8f14b..4674e8f14b 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 ad67bfe522..ad67bfe522 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 4356af9516..4356af9516 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 d3134a55d4..d3134a55d4 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 250b94b019..250b94b019 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 04cd010a68..04cd010a68 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 a63bbaf4c5..a63bbaf4c5 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 c17d166402..c17d166402 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 d4411658f9..d4411658f9 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 6f7938e365..6f7938e365 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 9215fc423b..9215fc423b 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 250b94b019..250b94b019 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 a63bbaf4c5..a63bbaf4c5 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 4cb14f82f0..4cb14f82f0 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 6ab6c15c42..6ab6c15c42 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 6558b03909..6558b03909 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 475981a2ae..475981a2ae 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 a26abc4857..42bbf91f7b 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 cd69508eaf..cd69508eaf 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 94f36a7b7e..94f36a7b7e 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 c00ffbb807..c00ffbb807 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 20c61706b8..20c61706b8 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 526ecf05b6..526ecf05b6 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 568c44410b..568c44410b 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 18ec9e6f4f..18ec9e6f4f 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 493ff766ba..493ff766ba 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 cc58a8e374..cc58a8e374 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 980eec3c92..980eec3c92 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 8e2639d03b..8e2639d03b 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 cd08923abe..cd08923abe 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 332f376d9f..332f376d9f 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 02b71305fe..02b71305fe 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 b6c7c87ea1..b6c7c87ea1 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 269f7986dc..269f7986dc 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 72d848dc92..5ccda88b52 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 1ce4598de6..1ce4598de6 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 4921913909..4921913909 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 30cee878be..30cee878be 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 e0fd8fefce..e0fd8fefce 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 6636894ea4..6636894ea4 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 08778e92a4..08778e92a4 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 f71a4e03c7..f71a4e03c7 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 10c2811600..f0cfa15da0 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 226c94500f..226c94500f 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 b9d38afd59..b9d38afd59 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 22ab278ed0..22ab278ed0 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 d15c0a8888..d15c0a8888 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 b2af27e98e..b2af27e98e 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 9de8868f77..9de8868f77 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 496544e925..496544e925 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 78fa236fae..78fa236fae 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 e956a29f38..e956a29f38 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 d71d99c531..d71d99c531 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 6525e59ed4..6525e59ed4 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 f2f18168de..f2f18168de 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 88c08b46e8..88c08b46e8 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 a16a15da80..a16a15da80 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 cfe7585e43..cfe7585e43 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 50c8adcb32..50c8adcb32 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 c8e73858fa..c8e73858fa 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 e50ab7abc7..e50ab7abc7 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 fad59ee6d1..fad59ee6d1 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 7c3a5234fb..7c3a5234fb 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 b3d91dc83e..b3d91dc83e 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 975751296e..992e430666 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 14ee692eda..14ee692eda 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 760151901f..760151901f 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 6cb3c92299..6cb3c92299 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 1436e66d0b..1436e66d0b 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 0570024062..0570024062 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 9d04164353..2b74749271 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 bac09a4d1a..bac09a4d1a 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 43e4b47881..43e4b47881 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 4d199c8424..4d199c8424 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 018b8341a2..018b8341a2 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 a189942957..a189942957 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 d00d719cc2..d00d719cc2 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 6130fd5020..6130fd5020 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 2c2d1694d4..2c2d1694d4 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 2b3e58cbf1..2b3e58cbf1 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 70aceb618f..70aceb618f 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 032400ceda..032400ceda 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 d5cf85aa10..d5cf85aa10 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 05a2ff703c..05a2ff703c 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 a88f87a5ce..a88f87a5ce 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 16349d2287..16349d2287 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 160fab6164..160fab6164 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 410a61f9fe..410a61f9fe 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 8a65afadec..8a65afadec 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 101fc0cbbe..101fc0cbbe 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 e07a93a231..e07a93a231 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 a3506444b1..a3506444b1 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 5a62c00a7f..5a62c00a7f 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 ebe6d040a4..ebe6d040a4 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 6fb436763d..12a345ecc3 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 9a76ebea97..9a76ebea97 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 6d004b1721..6d004b1721 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 8a68246853..8a68246853 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 adf23637ab..adf23637ab 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 80b22e6d5d..80b22e6d5d 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 8d3f7f9592..8d3f7f9592 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 7a298d9620..7a298d9620 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 aa25863aed..aa25863aed 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 71ec4e2b10..71ec4e2b10 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 b65e4ec0c0..b65e4ec0c0 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 fd59433251..fd59433251 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 e2a6e38e31..e2a6e38e31 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 67fca2e78e..67fca2e78e 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 75c0e1c689..75c0e1c689 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 f1608aae11..f1608aae11 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 507cc3b587..507cc3b587 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 aaed154b9c..aaed154b9c 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 03269cd194..03269cd194 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 9730a9e14c..9730a9e14c 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 ce5b54177c..ce5b54177c 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 33452182fe..33452182fe 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 e0eef30206..e0eef30206 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 e476a1ebc0..e476a1ebc0 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 f6b76b7e14..f6b76b7e14 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 f932d18a80..f932d18a80 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 93b63a194a..6295fb4e12 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 744dcd8f08..744dcd8f08 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 c2cc85c263..c2cc85c263 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 744dcd8f08..744dcd8f08 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 08de6fa804..08de6fa804 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 744dcd8f08..744dcd8f08 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 bebd8e07c6..bebd8e07c6 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 744dcd8f08..744dcd8f08 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 42223a1930..42223a1930 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 17ef59ee02..17ef59ee02 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 ac79338ce5..ac79338ce5 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 280cfd2962..280cfd2962 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 21226ed2a7..21226ed2a7 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 e69de29bb2..e69de29bb2 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 dcacc01140..dcacc01140 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 1f343e656f..1f343e656f 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 919bbcf09e..919bbcf09e 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 27c7931a92..27c7931a92 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 a5ac3ca3f0..a5ac3ca3f0 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 9725905160..9725905160 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 43d4c10d12..43d4c10d12 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 356df7311e..356df7311e 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 8c6dd807e3..8c6dd807e3 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 c5b6b566cf..c5b6b566cf 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 6aeeaa32bf..f3ce48a3e9 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 bb16254a15..bb16254a15 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 53ba645049..53ba645049 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 0ec1325871..0ec1325871 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 bef3b1cdc0..bef3b1cdc0 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 79a0f8e310..79a0f8e310 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 bb95421995..bb95421995 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 0d4518cc20..0d4518cc20 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 214c6e7c3e..214c6e7c3e 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 804640b715..cbd3e2ccd2 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 280cfd2962..280cfd2962 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 a19319b3c2..9678990df7 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 c10c4001d5..c10c4001d5 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 8eadd979c3..8eadd979c3 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 31647d69fb..31647d69fb 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 50d161e058..50d161e058 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 6366776b2b..6366776b2b 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 ff0d9e8e5e..ff0d9e8e5e 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 142aefd209..142aefd209 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 a8d02b7d5e..1d8ac11673 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 8785d0b08e..8785d0b08e 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 bd15777684..bd15777684 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 17ae6aa614..17ae6aa614 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 ee626ac5bf..9e612bc7a4 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 656b27a739..656b27a739 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 f49c6ff42d..f49c6ff42d 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 85367472b7..85367472b7 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 a5078b14c2..a5078b14c2 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 3c40158832..3c40158832 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 3959dae8e6..3959dae8e6 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 15c04d7721..15c04d7721 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 6c07ec028a..6c07ec028a 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 6a94679c2b..6a94679c2b 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 fce35efdf7..fce35efdf7 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 ce2545171b..ce2545171b 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 ba6af22ce9..ba6af22ce9 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 9e9df9407c..9e9df9407c 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 3a97e9de1f..3a97e9de1f 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 4cb1a835bd..4cb1a835bd 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 fe5148ed7d..fe5148ed7d 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 8ea0508b53..0861ffa24c 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 7cb4fd5883..7cb4fd5883 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 c0f88b3119..c0f88b3119 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 40dc8dca0f..d4bb0c1b92 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 73d94c1ce1..73d94c1ce1 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 5e60f09534..5e60f09534 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 027d5636be..027d5636be 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 7fd41ed9ba..7fd41ed9ba 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 9a2a1bf1b7..efb0ab6e41 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 cba1cf0c23..cba1cf0c23 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 fd8f9548a2..fd8f9548a2 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 bf0fb512a7..bf0fb512a7 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 a3712e9964..a3712e9964 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 303c142fd8..303c142fd8 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 176675a820..176675a820 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 7aff8bd760..7aff8bd760 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 58ce86ccd8..58ce86ccd8 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 3f2bf2f96c..b0df947d89 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 0000000000..3f2bf2f96c
--- /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 7c4ca2243b..7c4ca2243b 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 51880533a9..384eb701e6 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 613cf60d53..7d15ebd445 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 3b8476177f..3b8476177f 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 f538371620..1c36ce8a1b 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 122842cd5e..d3c933a754 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 3b8476177f..3b8476177f 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 046bfc458d..f2f2879a94 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 c8d294860f..d7f1b0ef1a 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 87b137fb22..87b137fb22 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 bc0be40243..bc0be40243 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 9505ebf082..9505ebf082 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 67d9e38236..67d9e38236 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 bd7b64cc23..bd7b64cc23 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 f8552b7415..f8552b7415 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 238e95e3df..238e95e3df 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 20f09477ce..20f09477ce 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 05ec87483e..05ec87483e 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 de742c7b7e..de742c7b7e 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 686149f7b0..686149f7b0 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 f13d65c507..f13d65c507 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 3f7290a41f..3f7290a41f 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 2d3c9a6624..2d3c9a6624 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 3696f8476a..3696f8476a 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 07128da1d2..07128da1d2 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 788006a48d..788006a48d 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 fd8e53b4f9..fd8e53b4f9 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 6732bc184c..6732bc184c 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 8effa17305..8effa17305 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 f9d06b38af..f9d06b38af 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 9b5a691821..9b5a691821 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 a391f69557..a391f69557 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 c2cdaab573..c2cdaab573 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 d50d9d2681..d50d9d2681 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 f596e852c1..f596e852c1 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 7f5734664a..7f5734664a 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 725cab29d8..725cab29d8 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 0337a66db8..0337a66db8 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 2635240f89..2635240f89 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 4e2b90a3b3..4e2b90a3b3 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 b5f155cb1d..b5f155cb1d 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 0ef3b3faf4..0ef3b3faf4 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 9120a92162..9120a92162 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 cb6cee10fc..cb6cee10fc 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 5147bbb6d2..5147bbb6d2 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 b263e620a9..b263e620a9 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 79cc48e3d0..79cc48e3d0 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 f6f8a7df52..f6f8a7df52 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 37f6a46371..37f6a46371 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 27442a7d2c..27442a7d2c 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 88454c0bf1..88454c0bf1 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 eb279724e3..eb279724e3 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 7dcd85a3fb..7dcd85a3fb 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 48cdd352cc..48cdd352cc 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 85e864943c..85e864943c 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 da747e2300..da747e2300 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 ca545da7e1..b0df947d89 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -1,18 +1 @@
-# Generated from manual.pro.
-
-add_subdirectory(buttons)
-add_subdirectory(dialogs)
-add_subdirectory(fonts)
-add_subdirectory(gifs)
-add_subdirectory(headerview)
-add_subdirectory(qquickdialog)
-add_subdirectory(screenshots)
-add_subdirectory(styles)
-add_subdirectory(styles-cover-flow)
-add_subdirectory(testbench)
-if(QT_FEATURE_systemtrayicon)
-    add_subdirectory(systemtrayicon)
-endif()
-if(TARGET Qt::Widgets)
-    add_subdirectory(viewinqwidget)
-endif()
+add_subdirectory(quickcontrols2)
diff --git a/tests/manual/quickcontrols2/CMakeLists.txt b/tests/manual/quickcontrols2/CMakeLists.txt
new file mode 100644
index 0000000000..4587ecf1cd
--- /dev/null
+++ b/tests/manual/quickcontrols2/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from manual.pro.
+
+add_subdirectory(buttons)
+add_subdirectory(dialogs)
+add_subdirectory(fonts)
+add_subdirectory(gifs)
+add_subdirectory(headerview)
+add_subdirectory(qquickdialog)
+add_subdirectory(screenshots)
+add_subdirectory(styles)
+add_subdirectory(styles-cover-flow)
+add_subdirectory(testbench)
+if(QT_FEATURE_systemtrayicon)
+    add_subdirectory(systemtrayicon)
+endif()
+if(TARGET Qt::Widgets AND TARGET Qt::QuickWidgets)
+    add_subdirectory(viewinqwidget)
+endif()
diff --git a/tests/manual/buttons/ButtonLoader.qml b/tests/manual/quickcontrols2/buttons/ButtonLoader.qml
index ecbf637b17..ecbf637b17 100644
--- a/tests/manual/buttons/ButtonLoader.qml
+++ b/tests/manual/quickcontrols2/buttons/ButtonLoader.qml
diff --git a/tests/manual/buttons/CMakeLists.txt b/tests/manual/quickcontrols2/buttons/CMakeLists.txt
index 57f80c88d9..57f80c88d9 100644
--- a/tests/manual/buttons/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/buttons/CMakeLists.txt
diff --git a/tests/manual/buttons/buttons.cpp b/tests/manual/quickcontrols2/buttons/buttons.cpp
index 0272522a50..0272522a50 100644
--- a/tests/manual/buttons/buttons.cpp
+++ b/tests/manual/quickcontrols2/buttons/buttons.cpp
diff --git a/tests/manual/buttons/buttons.pro b/tests/manual/quickcontrols2/buttons/buttons.pro
index 2cb1c14c54..2cb1c14c54 100644
--- a/tests/manual/buttons/buttons.pro
+++ b/tests/manual/quickcontrols2/buttons/buttons.pro
diff --git a/tests/manual/buttons/buttons.qml b/tests/manual/quickcontrols2/buttons/buttons.qml
index 26969440de..26969440de 100644
--- a/tests/manual/buttons/buttons.qml
+++ b/tests/manual/quickcontrols2/buttons/buttons.qml
diff --git a/tests/manual/dialogs/CMakeLists.txt b/tests/manual/quickcontrols2/dialogs/CMakeLists.txt
index cc132f36e4..cc132f36e4 100644
--- a/tests/manual/dialogs/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/dialogs/CMakeLists.txt
diff --git a/tests/manual/dialogs/FileDialogPage.qml b/tests/manual/quickcontrols2/dialogs/FileDialogPage.qml
index 9faad47e49..9faad47e49 100644
--- a/tests/manual/dialogs/FileDialogPage.qml
+++ b/tests/manual/quickcontrols2/dialogs/FileDialogPage.qml
diff --git a/tests/manual/dialogs/FontDialogPage.qml b/tests/manual/quickcontrols2/dialogs/FontDialogPage.qml
index 5b5d103445..5b5d103445 100644
--- a/tests/manual/dialogs/FontDialogPage.qml
+++ b/tests/manual/quickcontrols2/dialogs/FontDialogPage.qml
diff --git a/tests/manual/dialogs/StringListView.qml b/tests/manual/quickcontrols2/dialogs/StringListView.qml
index 4a229404fc..4a229404fc 100644
--- a/tests/manual/dialogs/StringListView.qml
+++ b/tests/manual/quickcontrols2/dialogs/StringListView.qml
diff --git a/tests/manual/dialogs/Theme.qml b/tests/manual/quickcontrols2/dialogs/Theme.qml
index 8114f14eb1..8114f14eb1 100644
--- a/tests/manual/dialogs/Theme.qml
+++ b/tests/manual/quickcontrols2/dialogs/Theme.qml
diff --git a/tests/manual/dialogs/dialogs.cpp b/tests/manual/quickcontrols2/dialogs/dialogs.cpp
index 8bab70e26d..8bab70e26d 100644
--- a/tests/manual/dialogs/dialogs.cpp
+++ b/tests/manual/quickcontrols2/dialogs/dialogs.cpp
diff --git a/tests/manual/dialogs/dialogs.pro b/tests/manual/quickcontrols2/dialogs/dialogs.pro
index 7dc1b8fd05..7dc1b8fd05 100644
--- a/tests/manual/dialogs/dialogs.pro
+++ b/tests/manual/quickcontrols2/dialogs/dialogs.pro
diff --git a/tests/manual/dialogs/dialogs.qml b/tests/manual/quickcontrols2/dialogs/dialogs.qml
index 6e64659e88..6e64659e88 100644
--- a/tests/manual/dialogs/dialogs.qml
+++ b/tests/manual/quickcontrols2/dialogs/dialogs.qml
diff --git a/tests/manual/dialogs/qmldir b/tests/manual/quickcontrols2/dialogs/qmldir
index 4f4a6b7bf9..4f4a6b7bf9 100644
--- a/tests/manual/dialogs/qmldir
+++ b/tests/manual/quickcontrols2/dialogs/qmldir
diff --git a/tests/manual/fonts/CMakeLists.txt b/tests/manual/quickcontrols2/fonts/CMakeLists.txt
index 6160ff1162..6160ff1162 100644
--- a/tests/manual/fonts/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/fonts/CMakeLists.txt
diff --git a/tests/manual/fonts/deployment.pri b/tests/manual/quickcontrols2/fonts/deployment.pri
index c89af25a85..c89af25a85 100644
--- a/tests/manual/fonts/deployment.pri
+++ b/tests/manual/quickcontrols2/fonts/deployment.pri
diff --git a/tests/manual/fonts/fonts.pro b/tests/manual/quickcontrols2/fonts/fonts.pro
index 36e70f7e18..36e70f7e18 100644
--- a/tests/manual/fonts/fonts.pro
+++ b/tests/manual/quickcontrols2/fonts/fonts.pro
diff --git a/tests/manual/fonts/main.cpp b/tests/manual/quickcontrols2/fonts/main.cpp
index 43e58bdd35..43e58bdd35 100644
--- a/tests/manual/fonts/main.cpp
+++ b/tests/manual/quickcontrols2/fonts/main.cpp
diff --git a/tests/manual/fonts/main.qml b/tests/manual/quickcontrols2/fonts/main.qml
index 8d3464a005..8d3464a005 100644
--- a/tests/manual/fonts/main.qml
+++ b/tests/manual/quickcontrols2/fonts/main.qml
diff --git a/tests/manual/fonts/qml.qrc b/tests/manual/quickcontrols2/fonts/qml.qrc
index 0ff3892d9c..0ff3892d9c 100644
--- a/tests/manual/fonts/qml.qrc
+++ b/tests/manual/quickcontrols2/fonts/qml.qrc
diff --git a/tests/manual/gifs/CMakeLists.txt b/tests/manual/quickcontrols2/gifs/CMakeLists.txt
index a2fc53554d..a2fc53554d 100644
--- a/tests/manual/gifs/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/gifs/CMakeLists.txt
diff --git a/tests/manual/gifs/capturedevent.cpp b/tests/manual/quickcontrols2/gifs/capturedevent.cpp
index cec5e97a6b..cec5e97a6b 100644
--- a/tests/manual/gifs/capturedevent.cpp
+++ b/tests/manual/quickcontrols2/gifs/capturedevent.cpp
diff --git a/tests/manual/gifs/capturedevent.h b/tests/manual/quickcontrols2/gifs/capturedevent.h
index 28ed510a8d..28ed510a8d 100644
--- a/tests/manual/gifs/capturedevent.h
+++ b/tests/manual/quickcontrols2/gifs/capturedevent.h
diff --git a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-busyindicator.qml
index 37dc5c7fd9..37dc5c7fd9 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-busyindicator.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-flat.qml
index dd07926ff1..dd07926ff1 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-flat.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-highlighted.qml
index 4af50d6b2c..4af50d6b2c 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button-highlighted.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-button.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button.qml
index 8336855c46..8336855c46 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-button.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-button.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox-tristate.qml
index b0bee6cd54..b0bee6cd54 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox-tristate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox.qml
index 46cdc073aa..46cdc073aa 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkbox.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml
index 585aea2704..585aea2704 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate.qml
index 704a060114..704a060114 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-checkdelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-combobox.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-combobox.qml
index 274f2efe61..274f2efe61 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-combobox.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-combobox.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-delaybutton.qml
index 8eaa3df24a..8eaa3df24a 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-delaybutton.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-no-wrap.qml
index 3b9b14668f..3b9b14668f 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-no-wrap.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-wrap.qml
index 317d81d27b..317d81d27b 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-dial-wrap.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-drawer.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-drawer.qml
index 32efcba8c4..32efcba8c4 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-drawer.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-drawer.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-itemdelegate.qml
index 1ef9e2c0c6..1ef9e2c0c6 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-itemdelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-menu.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-menu.qml
index 80f2c86d51..80f2c86d51 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-menu.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-menu.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml
index 4679ea03c8..4679ea03c8 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar.qml
index 994af450b7..994af450b7 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-progressbar.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiobutton.qml
index fec7ec9b01..fec7ec9b01 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiobutton.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiodelegate.qml
index a00f320927..a00f320927 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-radiodelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-rangeslider.qml
index c648f9983a..c648f9983a 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-rangeslider.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar-snap.qml
index cc4d6dc2fa..cc4d6dc2fa 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar-snap.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar.qml
index e838673a2a..e838673a2a 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollbar.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollindicator.qml
index be23df3b25..be23df3b25 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-scrollindicator.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider-snap.qml
index 26066770e7..26066770e7 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider-snap.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider.qml
index 83f652aa26..83f652aa26 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-slider.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-slider.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-pop.qml
index 7ddd8db803..7ddd8db803 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-pop.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-push.qml
index 88229fce7e..88229fce7e 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-push.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-replace.qml
index 59885745c1..59885745c1 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-replace.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-unwind.qml
index a7435d2ac7..a7435d2ac7 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-stackview-unwind.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
index 0b18c6a336..0b18c6a336 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
index 789fb86f55..789fb86f55 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate.qml
index c78fc6d4f9..c78fc6d4f9 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipedelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipeview.qml
index 9004ff183b..9004ff183b 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-swipeview.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-switch.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switch.qml
index a9497bded5..a9497bded5 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-switch.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switch.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switchdelegate.qml
index 1caece5b16..1caece5b16 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-switchdelegate.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tabbar.qml
index a973cef8c4..a973cef8c4 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tabbar.qml
diff --git a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tumbler-wrap.qml
index bfad311e25..bfad311e25 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml
+++ b/tests/manual/quickcontrols2/gifs/data/qtquickcontrols2-tumbler-wrap.qml
diff --git a/tests/manual/gifs/eventcapturer.cpp b/tests/manual/quickcontrols2/gifs/eventcapturer.cpp
index ad88b1dbf9..ad88b1dbf9 100644
--- a/tests/manual/gifs/eventcapturer.cpp
+++ b/tests/manual/quickcontrols2/gifs/eventcapturer.cpp
diff --git a/tests/manual/gifs/eventcapturer.h b/tests/manual/quickcontrols2/gifs/eventcapturer.h
index ea01299f54..ea01299f54 100644
--- a/tests/manual/gifs/eventcapturer.h
+++ b/tests/manual/quickcontrols2/gifs/eventcapturer.h
diff --git a/tests/manual/gifs/gifrecorder.cpp b/tests/manual/quickcontrols2/gifs/gifrecorder.cpp
index 4bc7c9cdf0..4bc7c9cdf0 100644
--- a/tests/manual/gifs/gifrecorder.cpp
+++ b/tests/manual/quickcontrols2/gifs/gifrecorder.cpp
diff --git a/tests/manual/gifs/gifrecorder.h b/tests/manual/quickcontrols2/gifs/gifrecorder.h
index 30d06b111a..30d06b111a 100644
--- a/tests/manual/gifs/gifrecorder.h
+++ b/tests/manual/quickcontrols2/gifs/gifrecorder.h
diff --git a/tests/manual/gifs/gifs.pro b/tests/manual/quickcontrols2/gifs/gifs.pro
index a5bb72c792..a5bb72c792 100644
--- a/tests/manual/gifs/gifs.pro
+++ b/tests/manual/quickcontrols2/gifs/gifs.pro
diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/quickcontrols2/gifs/tst_gifs.cpp
index 80c3fd9fef..80c3fd9fef 100644
--- a/tests/manual/gifs/tst_gifs.cpp
+++ b/tests/manual/quickcontrols2/gifs/tst_gifs.cpp
diff --git a/tests/manual/headerview/CMakeLists.txt b/tests/manual/quickcontrols2/headerview/CMakeLists.txt
index 4c4ae94a56..4c4ae94a56 100644
--- a/tests/manual/headerview/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/headerview/CMakeLists.txt
diff --git a/tests/manual/headerview/headerview.pro b/tests/manual/quickcontrols2/headerview/headerview.pro
index 474cc9214a..474cc9214a 100644
--- a/tests/manual/headerview/headerview.pro
+++ b/tests/manual/quickcontrols2/headerview/headerview.pro
diff --git a/tests/manual/headerview/main.cpp b/tests/manual/quickcontrols2/headerview/main.cpp
index a11f862704..a11f862704 100644
--- a/tests/manual/headerview/main.cpp
+++ b/tests/manual/quickcontrols2/headerview/main.cpp
diff --git a/tests/manual/headerview/main.qml b/tests/manual/quickcontrols2/headerview/main.qml
index abce1c00e0..abce1c00e0 100644
--- a/tests/manual/headerview/main.qml
+++ b/tests/manual/quickcontrols2/headerview/main.qml
diff --git a/tests/manual/manual.pro b/tests/manual/quickcontrols2/manual.pro
index 27ec27f18d..27ec27f18d 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/quickcontrols2/manual.pro
diff --git a/tests/manual/nativestyle/.gitignore b/tests/manual/quickcontrols2/nativestyle/.gitignore
index fab7372d79..fab7372d79 100644
--- a/tests/manual/nativestyle/.gitignore
+++ b/tests/manual/quickcontrols2/nativestyle/.gitignore
diff --git a/tests/manual/nativestyle/Buttons.qml b/tests/manual/quickcontrols2/nativestyle/Buttons.qml
index d5eb2a9cd3..d5eb2a9cd3 100644
--- a/tests/manual/nativestyle/Buttons.qml
+++ b/tests/manual/quickcontrols2/nativestyle/Buttons.qml
diff --git a/tests/manual/nativestyle/CMakeLists.txt b/tests/manual/quickcontrols2/nativestyle/CMakeLists.txt
index 269d2301bd..269d2301bd 100644
--- a/tests/manual/nativestyle/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/nativestyle/CMakeLists.txt
diff --git a/tests/manual/nativestyle/CheckBoxes.qml b/tests/manual/quickcontrols2/nativestyle/CheckBoxes.qml
index c24e9a54d9..c24e9a54d9 100644
--- a/tests/manual/nativestyle/CheckBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CheckBoxes.qml
diff --git a/tests/manual/nativestyle/ComboBoxes.qml b/tests/manual/quickcontrols2/nativestyle/ComboBoxes.qml
index 21dd5b091c..21dd5b091c 100644
--- a/tests/manual/nativestyle/ComboBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/ComboBoxes.qml
diff --git a/tests/manual/nativestyle/ControlContainer.qml b/tests/manual/quickcontrols2/nativestyle/ControlContainer.qml
index 5ac9f6bb18..5ac9f6bb18 100644
--- a/tests/manual/nativestyle/ControlContainer.qml
+++ b/tests/manual/quickcontrols2/nativestyle/ControlContainer.qml
diff --git a/tests/manual/nativestyle/CustomButtons.qml b/tests/manual/quickcontrols2/nativestyle/CustomButtons.qml
index 6a01faeda5..6a01faeda5 100644
--- a/tests/manual/nativestyle/CustomButtons.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomButtons.qml
diff --git a/tests/manual/nativestyle/CustomCheckBoxes.qml b/tests/manual/quickcontrols2/nativestyle/CustomCheckBoxes.qml
index 00dc7378f4..00dc7378f4 100644
--- a/tests/manual/nativestyle/CustomCheckBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomCheckBoxes.qml
diff --git a/tests/manual/nativestyle/CustomComboBoxes.qml b/tests/manual/quickcontrols2/nativestyle/CustomComboBoxes.qml
index a51cca9401..a51cca9401 100644
--- a/tests/manual/nativestyle/CustomComboBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomComboBoxes.qml
diff --git a/tests/manual/nativestyle/CustomDials.qml b/tests/manual/quickcontrols2/nativestyle/CustomDials.qml
index b0df77b603..b0df77b603 100644
--- a/tests/manual/nativestyle/CustomDials.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomDials.qml
diff --git a/tests/manual/nativestyle/CustomFrames.qml b/tests/manual/quickcontrols2/nativestyle/CustomFrames.qml
index e2b045a5cd..e2b045a5cd 100644
--- a/tests/manual/nativestyle/CustomFrames.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomFrames.qml
diff --git a/tests/manual/nativestyle/CustomProgressBars.qml b/tests/manual/quickcontrols2/nativestyle/CustomProgressBars.qml
index 6ace8f20bc..6ace8f20bc 100644
--- a/tests/manual/nativestyle/CustomProgressBars.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomProgressBars.qml
diff --git a/tests/manual/nativestyle/CustomRadioButtons.qml b/tests/manual/quickcontrols2/nativestyle/CustomRadioButtons.qml
index 8a657cdd5f..8a657cdd5f 100644
--- a/tests/manual/nativestyle/CustomRadioButtons.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomRadioButtons.qml
diff --git a/tests/manual/nativestyle/CustomScrollBars.qml b/tests/manual/quickcontrols2/nativestyle/CustomScrollBars.qml
index 0731995247..0731995247 100644
--- a/tests/manual/nativestyle/CustomScrollBars.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomScrollBars.qml
diff --git a/tests/manual/nativestyle/CustomSliders.qml b/tests/manual/quickcontrols2/nativestyle/CustomSliders.qml
index 075c10d326..075c10d326 100644
--- a/tests/manual/nativestyle/CustomSliders.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomSliders.qml
diff --git a/tests/manual/nativestyle/CustomSpinBoxes.qml b/tests/manual/quickcontrols2/nativestyle/CustomSpinBoxes.qml
index b6de2b57f7..b6de2b57f7 100644
--- a/tests/manual/nativestyle/CustomSpinBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomSpinBoxes.qml
diff --git a/tests/manual/nativestyle/CustomTextAreas.qml b/tests/manual/quickcontrols2/nativestyle/CustomTextAreas.qml
index 77e97b0cc0..77e97b0cc0 100644
--- a/tests/manual/nativestyle/CustomTextAreas.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomTextAreas.qml
diff --git a/tests/manual/nativestyle/CustomTextFields.qml b/tests/manual/quickcontrols2/nativestyle/CustomTextFields.qml
index 3e8ccd1e7b..3e8ccd1e7b 100644
--- a/tests/manual/nativestyle/CustomTextFields.qml
+++ b/tests/manual/quickcontrols2/nativestyle/CustomTextFields.qml
diff --git a/tests/manual/nativestyle/Dials.qml b/tests/manual/quickcontrols2/nativestyle/Dials.qml
index f0655f25fb..f0655f25fb 100644
--- a/tests/manual/nativestyle/Dials.qml
+++ b/tests/manual/quickcontrols2/nativestyle/Dials.qml
diff --git a/tests/manual/nativestyle/Frames.qml b/tests/manual/quickcontrols2/nativestyle/Frames.qml
index 220f8d034e..220f8d034e 100644
--- a/tests/manual/nativestyle/Frames.qml
+++ b/tests/manual/quickcontrols2/nativestyle/Frames.qml
diff --git a/tests/manual/nativestyle/ProgressBars.qml b/tests/manual/quickcontrols2/nativestyle/ProgressBars.qml
index 8abd076d96..8abd076d96 100644
--- a/tests/manual/nativestyle/ProgressBars.qml
+++ b/tests/manual/quickcontrols2/nativestyle/ProgressBars.qml
diff --git a/tests/manual/nativestyle/RadioButtons.qml b/tests/manual/quickcontrols2/nativestyle/RadioButtons.qml
index 24a96b5910..24a96b5910 100644
--- a/tests/manual/nativestyle/RadioButtons.qml
+++ b/tests/manual/quickcontrols2/nativestyle/RadioButtons.qml
diff --git a/tests/manual/nativestyle/ScrollBars.qml b/tests/manual/quickcontrols2/nativestyle/ScrollBars.qml
index a5764c789f..a5764c789f 100644
--- a/tests/manual/nativestyle/ScrollBars.qml
+++ b/tests/manual/quickcontrols2/nativestyle/ScrollBars.qml
diff --git a/tests/manual/nativestyle/Sliders.qml b/tests/manual/quickcontrols2/nativestyle/Sliders.qml
index 81afa26c9f..81afa26c9f 100644
--- a/tests/manual/nativestyle/Sliders.qml
+++ b/tests/manual/quickcontrols2/nativestyle/Sliders.qml
diff --git a/tests/manual/nativestyle/SlidersMini.qml b/tests/manual/quickcontrols2/nativestyle/SlidersMini.qml
index 4c7610c497..4c7610c497 100644
--- a/tests/manual/nativestyle/SlidersMini.qml
+++ b/tests/manual/quickcontrols2/nativestyle/SlidersMini.qml
diff --git a/tests/manual/nativestyle/SlidersSmall.qml b/tests/manual/quickcontrols2/nativestyle/SlidersSmall.qml
index 04c9cb24e7..04c9cb24e7 100644
--- a/tests/manual/nativestyle/SlidersSmall.qml
+++ b/tests/manual/quickcontrols2/nativestyle/SlidersSmall.qml
diff --git a/tests/manual/nativestyle/SpinBoxes.qml b/tests/manual/quickcontrols2/nativestyle/SpinBoxes.qml
index 552f159bb9..552f159bb9 100644
--- a/tests/manual/nativestyle/SpinBoxes.qml
+++ b/tests/manual/quickcontrols2/nativestyle/SpinBoxes.qml
diff --git a/tests/manual/nativestyle/TextAreas.qml b/tests/manual/quickcontrols2/nativestyle/TextAreas.qml
index d8d49c021b..d8d49c021b 100644
--- a/tests/manual/nativestyle/TextAreas.qml
+++ b/tests/manual/quickcontrols2/nativestyle/TextAreas.qml
diff --git a/tests/manual/nativestyle/TextFields.qml b/tests/manual/quickcontrols2/nativestyle/TextFields.qml
index 10e97da5e8..10e97da5e8 100644
--- a/tests/manual/nativestyle/TextFields.qml
+++ b/tests/manual/quickcontrols2/nativestyle/TextFields.qml
diff --git a/tests/manual/nativestyle/checkbox-icon.png b/tests/manual/quickcontrols2/nativestyle/checkbox-icon.png
index ee669b3a88..ee669b3a88 100644
--- a/tests/manual/nativestyle/checkbox-icon.png
+++ b/tests/manual/quickcontrols2/nativestyle/checkbox-icon.png
diff --git a/tests/manual/nativestyle/checkbox-icon16.png b/tests/manual/quickcontrols2/nativestyle/checkbox-icon16.png
index 8d89eab841..8d89eab841 100644
--- a/tests/manual/nativestyle/checkbox-icon16.png
+++ b/tests/manual/quickcontrols2/nativestyle/checkbox-icon16.png
diff --git a/tests/manual/nativestyle/checkbox-icon@2x.png b/tests/manual/quickcontrols2/nativestyle/checkbox-icon@2x.png
index 51c5601de0..51c5601de0 100644
--- a/tests/manual/nativestyle/checkbox-icon@2x.png
+++ b/tests/manual/quickcontrols2/nativestyle/checkbox-icon@2x.png
diff --git a/tests/manual/nativestyle/main.cpp b/tests/manual/quickcontrols2/nativestyle/main.cpp
index cc48753154..cc48753154 100644
--- a/tests/manual/nativestyle/main.cpp
+++ b/tests/manual/quickcontrols2/nativestyle/main.cpp
diff --git a/tests/manual/nativestyle/main.qml b/tests/manual/quickcontrols2/nativestyle/main.qml
index 5e44118c64..5e44118c64 100644
--- a/tests/manual/nativestyle/main.qml
+++ b/tests/manual/quickcontrols2/nativestyle/main.qml
diff --git a/tests/manual/nativestyle/nativestyle.pro b/tests/manual/quickcontrols2/nativestyle/nativestyle.pro
index 9c700430fe..9c700430fe 100644
--- a/tests/manual/nativestyle/nativestyle.pro
+++ b/tests/manual/quickcontrols2/nativestyle/nativestyle.pro
diff --git a/tests/manual/nativestyle/qml.qrc b/tests/manual/quickcontrols2/nativestyle/qml.qrc
index fba642e53f..fba642e53f 100644
--- a/tests/manual/nativestyle/qml.qrc
+++ b/tests/manual/quickcontrols2/nativestyle/qml.qrc
diff --git a/tests/manual/qquickdialog/CMakeLists.txt b/tests/manual/quickcontrols2/qquickdialog/CMakeLists.txt
index 661a7dc76c..661a7dc76c 100644
--- a/tests/manual/qquickdialog/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/qquickdialog/CMakeLists.txt
diff --git a/tests/manual/qquickdialog/CustomDialog.qml b/tests/manual/quickcontrols2/qquickdialog/CustomDialog.qml
index fb191c9f4e..fb191c9f4e 100644
--- a/tests/manual/qquickdialog/CustomDialog.qml
+++ b/tests/manual/quickcontrols2/qquickdialog/CustomDialog.qml
diff --git a/tests/manual/qquickdialog/DialogLabel.qml b/tests/manual/quickcontrols2/qquickdialog/DialogLabel.qml
index 3a1533eb16..3a1533eb16 100644
--- a/tests/manual/qquickdialog/DialogLabel.qml
+++ b/tests/manual/quickcontrols2/qquickdialog/DialogLabel.qml
diff --git a/tests/manual/qquickdialog/Marker.qml b/tests/manual/quickcontrols2/qquickdialog/Marker.qml
index cd93d05570..cd93d05570 100644
--- a/tests/manual/qquickdialog/Marker.qml
+++ b/tests/manual/quickcontrols2/qquickdialog/Marker.qml
diff --git a/tests/manual/qquickdialog/qquickdialog.cpp b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.cpp
index 77863abe83..77863abe83 100644
--- a/tests/manual/qquickdialog/qquickdialog.cpp
+++ b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.cpp
diff --git a/tests/manual/qquickdialog/qquickdialog.pro b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.pro
index aee7655b65..aee7655b65 100644
--- a/tests/manual/qquickdialog/qquickdialog.pro
+++ b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.pro
diff --git a/tests/manual/qquickdialog/qquickdialog.qml b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.qml
index 41bf6ab7c3..41bf6ab7c3 100644
--- a/tests/manual/qquickdialog/qquickdialog.qml
+++ b/tests/manual/quickcontrols2/qquickdialog/qquickdialog.qml
diff --git a/tests/manual/qquickdialog/qtquickcontrols2.conf b/tests/manual/quickcontrols2/qquickdialog/qtquickcontrols2.conf
index 53f380bfc9..53f380bfc9 100644
--- a/tests/manual/qquickdialog/qtquickcontrols2.conf
+++ b/tests/manual/quickcontrols2/qquickdialog/qtquickcontrols2.conf
diff --git a/tests/manual/screenshots/CMakeLists.txt b/tests/manual/quickcontrols2/screenshots/CMakeLists.txt
index b6bd292615..b6bd292615 100644
--- a/tests/manual/screenshots/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/screenshots/CMakeLists.txt
diff --git a/tests/manual/screenshots/qtquickcontrols2.conf b/tests/manual/quickcontrols2/screenshots/qtquickcontrols2.conf
index d2081db1d0..d2081db1d0 100644
--- a/tests/manual/screenshots/qtquickcontrols2.conf
+++ b/tests/manual/quickcontrols2/screenshots/qtquickcontrols2.conf
diff --git a/tests/manual/screenshots/screenshots.cpp b/tests/manual/quickcontrols2/screenshots/screenshots.cpp
index e4e1844d6f..e4e1844d6f 100644
--- a/tests/manual/screenshots/screenshots.cpp
+++ b/tests/manual/quickcontrols2/screenshots/screenshots.cpp
diff --git a/tests/manual/screenshots/screenshots.pro b/tests/manual/quickcontrols2/screenshots/screenshots.pro
index 5894888f13..5894888f13 100644
--- a/tests/manual/screenshots/screenshots.pro
+++ b/tests/manual/quickcontrols2/screenshots/screenshots.pro
diff --git a/tests/manual/screenshots/screenshots.qml b/tests/manual/quickcontrols2/screenshots/screenshots.qml
index 3496b32bd6..3496b32bd6 100644
--- a/tests/manual/screenshots/screenshots.qml
+++ b/tests/manual/quickcontrols2/screenshots/screenshots.qml
diff --git a/tests/manual/shared/FontAwesome.otf b/tests/manual/quickcontrols2/shared/FontAwesome.otf
index 681bdd4d4c..681bdd4d4c 100644
--- a/tests/manual/shared/FontAwesome.otf
+++ b/tests/manual/quickcontrols2/shared/FontAwesome.otf
diff --git a/tests/manual/shared/FontAwesome.qml b/tests/manual/quickcontrols2/shared/FontAwesome.qml
index d64176b4a4..d64176b4a4 100644
--- a/tests/manual/shared/FontAwesome.qml
+++ b/tests/manual/quickcontrols2/shared/FontAwesome.qml
diff --git a/tests/manual/shared/FontAwesomeIcon.qml b/tests/manual/quickcontrols2/shared/FontAwesomeIcon.qml
index 74e7c5da12..74e7c5da12 100644
--- a/tests/manual/shared/FontAwesomeIcon.qml
+++ b/tests/manual/quickcontrols2/shared/FontAwesomeIcon.qml
diff --git a/tests/manual/shared/qmldir b/tests/manual/quickcontrols2/shared/qmldir
index 3cb55667c7..3cb55667c7 100644
--- a/tests/manual/shared/qmldir
+++ b/tests/manual/quickcontrols2/shared/qmldir
diff --git a/tests/manual/shared/shared.qrc b/tests/manual/quickcontrols2/shared/shared.qrc
index 8dbb342156..8dbb342156 100644
--- a/tests/manual/shared/shared.qrc
+++ b/tests/manual/quickcontrols2/shared/shared.qrc
diff --git a/tests/manual/styles-cover-flow/CMakeLists.txt b/tests/manual/quickcontrols2/styles-cover-flow/CMakeLists.txt
index ab62046cd9..84d8460ad8 100644
--- a/tests/manual/styles-cover-flow/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/styles-cover-flow/CMakeLists.txt
@@ -15,7 +15,7 @@ qt_internal_add_manual_test(stylescoverflow
     SOURCES
         styles-cover-flow.cpp
     DEFINES
-        DOC_IMAGES_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports/controls/doc/images/\\\"
+        DOC_IMAGES_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/imports/controls/doc/images/\\\"
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Quick
diff --git a/tests/manual/styles-cover-flow/CoverFlowDelegate.qml b/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowDelegate.qml
index 061ecfa0a8..061ecfa0a8 100644
--- a/tests/manual/styles-cover-flow/CoverFlowDelegate.qml
+++ b/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowDelegate.qml
diff --git a/tests/manual/styles-cover-flow/CoverFlowPath.qml b/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowPath.qml
index 0f70e6b890..0f70e6b890 100644
--- a/tests/manual/styles-cover-flow/CoverFlowPath.qml
+++ b/tests/manual/quickcontrols2/styles-cover-flow/CoverFlowPath.qml
diff --git a/tests/manual/styles-cover-flow/styles-cover-flow.cpp b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.cpp
index d665d6139b..d665d6139b 100644
--- a/tests/manual/styles-cover-flow/styles-cover-flow.cpp
+++ b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.cpp
diff --git a/tests/manual/styles-cover-flow/styles-cover-flow.pro b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.pro
index 2faa9fbabb..2faa9fbabb 100644
--- a/tests/manual/styles-cover-flow/styles-cover-flow.pro
+++ b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.pro
diff --git a/tests/manual/styles-cover-flow/styles-cover-flow.qml b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.qml
index 0f400c0d5e..0f400c0d5e 100644
--- a/tests/manual/styles-cover-flow/styles-cover-flow.qml
+++ b/tests/manual/quickcontrols2/styles-cover-flow/styles-cover-flow.qml
diff --git a/tests/manual/styles/CMakeLists.txt b/tests/manual/quickcontrols2/styles/CMakeLists.txt
index 7ba6c733bb..7ba6c733bb 100644
--- a/tests/manual/styles/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/styles/CMakeLists.txt
diff --git a/tests/manual/styles/styles.cpp b/tests/manual/quickcontrols2/styles/styles.cpp
index a0f0de7b08..a0f0de7b08 100644
--- a/tests/manual/styles/styles.cpp
+++ b/tests/manual/quickcontrols2/styles/styles.cpp
diff --git a/tests/manual/styles/styles.pro b/tests/manual/quickcontrols2/styles/styles.pro
index 060ab4f7e8..060ab4f7e8 100644
--- a/tests/manual/styles/styles.pro
+++ b/tests/manual/quickcontrols2/styles/styles.pro
diff --git a/tests/manual/styles/styles.qml b/tests/manual/quickcontrols2/styles/styles.qml
index 83bd9b3441..83bd9b3441 100644
--- a/tests/manual/styles/styles.qml
+++ b/tests/manual/quickcontrols2/styles/styles.qml
diff --git a/tests/manual/systemtrayicon/CMakeLists.txt b/tests/manual/quickcontrols2/systemtrayicon/CMakeLists.txt
index b44a44967a..b44a44967a 100644
--- a/tests/manual/systemtrayicon/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/systemtrayicon/CMakeLists.txt
diff --git a/tests/manual/systemtrayicon/images/qt_logo_green_256.png b/tests/manual/quickcontrols2/systemtrayicon/images/qt_logo_green_256.png
index a7b16ba4f9..a7b16ba4f9 100644
--- a/tests/manual/systemtrayicon/images/qt_logo_green_256.png
+++ b/tests/manual/quickcontrols2/systemtrayicon/images/qt_logo_green_256.png
diff --git a/tests/manual/systemtrayicon/systemtrayicon.cpp b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.cpp
index 1866a269bf..1866a269bf 100644
--- a/tests/manual/systemtrayicon/systemtrayicon.cpp
+++ b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.cpp
diff --git a/tests/manual/systemtrayicon/systemtrayicon.pro b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.pro
index 24b9caa0cf..24b9caa0cf 100644
--- a/tests/manual/systemtrayicon/systemtrayicon.pro
+++ b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.pro
diff --git a/tests/manual/systemtrayicon/systemtrayicon.qml b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qml
index d44bc83b47..d44bc83b47 100644
--- a/tests/manual/systemtrayicon/systemtrayicon.qml
+++ b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qml
diff --git a/tests/manual/systemtrayicon/systemtrayicon.qrc b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qrc
index 656476d940..656476d940 100644
--- a/tests/manual/systemtrayicon/systemtrayicon.qrc
+++ b/tests/manual/quickcontrols2/systemtrayicon/systemtrayicon.qrc
diff --git a/tests/manual/testbench/+Imagine/ApplicationWindow.qml b/tests/manual/quickcontrols2/testbench/+Imagine/ApplicationWindow.qml
index a8e49b073c..a8e49b073c 100644
--- a/tests/manual/testbench/+Imagine/ApplicationWindow.qml
+++ b/tests/manual/quickcontrols2/testbench/+Imagine/ApplicationWindow.qml
diff --git a/tests/manual/testbench/+Imagine/ContentPane.qml b/tests/manual/quickcontrols2/testbench/+Imagine/ContentPane.qml
index 3e1cad864e..3e1cad864e 100644
--- a/tests/manual/testbench/+Imagine/ContentPane.qml
+++ b/tests/manual/quickcontrols2/testbench/+Imagine/ContentPane.qml
diff --git a/tests/manual/testbench/+Imagine/Dialog.qml b/tests/manual/quickcontrols2/testbench/+Imagine/Dialog.qml
index 7ea9619e95..7ea9619e95 100644
--- a/tests/manual/testbench/+Imagine/Dialog.qml
+++ b/tests/manual/quickcontrols2/testbench/+Imagine/Dialog.qml
diff --git a/tests/manual/testbench/+Imagine/Menu.qml b/tests/manual/quickcontrols2/testbench/+Imagine/Menu.qml
index 9587e0d4c0..9587e0d4c0 100644
--- a/tests/manual/testbench/+Imagine/Menu.qml
+++ b/tests/manual/quickcontrols2/testbench/+Imagine/Menu.qml
diff --git a/tests/manual/testbench/+Imagine/ToolBar.qml b/tests/manual/quickcontrols2/testbench/+Imagine/ToolBar.qml
index b1b32894a0..b1b32894a0 100644
--- a/tests/manual/testbench/+Imagine/ToolBar.qml
+++ b/tests/manual/quickcontrols2/testbench/+Imagine/ToolBar.qml
diff --git a/tests/manual/testbench/.gitignore b/tests/manual/quickcontrols2/testbench/.gitignore
index 75fae8bc39..75fae8bc39 100644
--- a/tests/manual/testbench/.gitignore
+++ b/tests/manual/quickcontrols2/testbench/.gitignore
diff --git a/tests/manual/testbench/ApplicationWindow.qml b/tests/manual/quickcontrols2/testbench/ApplicationWindow.qml
index 3c6785c913..3c6785c913 100644
--- a/tests/manual/testbench/ApplicationWindow.qml
+++ b/tests/manual/quickcontrols2/testbench/ApplicationWindow.qml
diff --git a/tests/manual/testbench/CMakeLists.txt b/tests/manual/quickcontrols2/testbench/CMakeLists.txt
index 66933a9225..66933a9225 100644
--- a/tests/manual/testbench/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/testbench/CMakeLists.txt
diff --git a/tests/manual/testbench/ColorEditor.qml b/tests/manual/quickcontrols2/testbench/ColorEditor.qml
index 2723f33dfc..2723f33dfc 100644
--- a/tests/manual/testbench/ColorEditor.qml
+++ b/tests/manual/quickcontrols2/testbench/ColorEditor.qml
diff --git a/tests/manual/testbench/ContentPane.qml b/tests/manual/quickcontrols2/testbench/ContentPane.qml
index 0a8c2f826c..0a8c2f826c 100644
--- a/tests/manual/testbench/ContentPane.qml
+++ b/tests/manual/quickcontrols2/testbench/ContentPane.qml
diff --git a/tests/manual/testbench/ControlContainer.qml b/tests/manual/quickcontrols2/testbench/ControlContainer.qml
index 4bd99bd304..4bd99bd304 100644
--- a/tests/manual/testbench/ControlContainer.qml
+++ b/tests/manual/quickcontrols2/testbench/ControlContainer.qml
diff --git a/tests/manual/testbench/Dialog.qml b/tests/manual/quickcontrols2/testbench/Dialog.qml
index 32c4806a5a..32c4806a5a 100644
--- a/tests/manual/testbench/Dialog.qml
+++ b/tests/manual/quickcontrols2/testbench/Dialog.qml
diff --git a/tests/manual/testbench/ExampleContainer.qml b/tests/manual/quickcontrols2/testbench/ExampleContainer.qml
index 903e52db3e..903e52db3e 100644
--- a/tests/manual/testbench/ExampleContainer.qml
+++ b/tests/manual/quickcontrols2/testbench/ExampleContainer.qml
diff --git a/tests/manual/testbench/Menu.qml b/tests/manual/quickcontrols2/testbench/Menu.qml
index 377cc3a057..377cc3a057 100644
--- a/tests/manual/testbench/Menu.qml
+++ b/tests/manual/quickcontrols2/testbench/Menu.qml
diff --git a/tests/manual/testbench/README.md b/tests/manual/quickcontrols2/testbench/README.md
index bd434de6a2..bd434de6a2 100644
--- a/tests/manual/testbench/README.md
+++ b/tests/manual/quickcontrols2/testbench/README.md
diff --git a/tests/manual/testbench/SettingsDialog.qml b/tests/manual/quickcontrols2/testbench/SettingsDialog.qml
index d11b5bea3e..d11b5bea3e 100644
--- a/tests/manual/testbench/SettingsDialog.qml
+++ b/tests/manual/quickcontrols2/testbench/SettingsDialog.qml
diff --git a/tests/manual/testbench/ToolBar.qml b/tests/manual/quickcontrols2/testbench/ToolBar.qml
index 90cbc1951f..90cbc1951f 100644
--- a/tests/manual/testbench/ToolBar.qml
+++ b/tests/manual/quickcontrols2/testbench/ToolBar.qml
diff --git a/tests/manual/testbench/assetfixer.cpp b/tests/manual/quickcontrols2/testbench/assetfixer.cpp
index 4813dac50d..4813dac50d 100644
--- a/tests/manual/testbench/assetfixer.cpp
+++ b/tests/manual/quickcontrols2/testbench/assetfixer.cpp
diff --git a/tests/manual/testbench/assetfixer.h b/tests/manual/quickcontrols2/testbench/assetfixer.h
index 4af9ccf4af..4af9ccf4af 100644
--- a/tests/manual/testbench/assetfixer.h
+++ b/tests/manual/quickcontrols2/testbench/assetfixer.h
diff --git a/tests/manual/testbench/clipboard.cpp b/tests/manual/quickcontrols2/testbench/clipboard.cpp
index 1daebfc92f..1daebfc92f 100644
--- a/tests/manual/testbench/clipboard.cpp
+++ b/tests/manual/quickcontrols2/testbench/clipboard.cpp
diff --git a/tests/manual/testbench/clipboard.h b/tests/manual/quickcontrols2/testbench/clipboard.h
index a21dd9c619..a21dd9c619 100644
--- a/tests/manual/testbench/clipboard.h
+++ b/tests/manual/quickcontrols2/testbench/clipboard.h
diff --git a/tests/manual/testbench/controls/BusyIndicator.qml b/tests/manual/quickcontrols2/testbench/controls/BusyIndicator.qml
index cc0f4518a4..cc0f4518a4 100644
--- a/tests/manual/testbench/controls/BusyIndicator.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/BusyIndicator.qml
diff --git a/tests/manual/testbench/controls/Button.qml b/tests/manual/quickcontrols2/testbench/controls/Button.qml
index ac57453fed..ac57453fed 100644
--- a/tests/manual/testbench/controls/Button.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Button.qml
diff --git a/tests/manual/testbench/controls/CheckBox.qml b/tests/manual/quickcontrols2/testbench/controls/CheckBox.qml
index 0598dae833..0598dae833 100644
--- a/tests/manual/testbench/controls/CheckBox.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/CheckBox.qml
diff --git a/tests/manual/testbench/controls/CheckDelegate.qml b/tests/manual/quickcontrols2/testbench/controls/CheckDelegate.qml
index 8f546384ff..8f546384ff 100644
--- a/tests/manual/testbench/controls/CheckDelegate.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/CheckDelegate.qml
diff --git a/tests/manual/testbench/controls/ComboBox.qml b/tests/manual/quickcontrols2/testbench/controls/ComboBox.qml
index 75fb7701b2..75fb7701b2 100644
--- a/tests/manual/testbench/controls/ComboBox.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ComboBox.qml
diff --git a/tests/manual/testbench/controls/DelayButton.qml b/tests/manual/quickcontrols2/testbench/controls/DelayButton.qml
index c0f6faa29b..c0f6faa29b 100644
--- a/tests/manual/testbench/controls/DelayButton.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/DelayButton.qml
diff --git a/tests/manual/testbench/controls/Dial.qml b/tests/manual/quickcontrols2/testbench/controls/Dial.qml
index 16c99ec833..16c99ec833 100644
--- a/tests/manual/testbench/controls/Dial.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Dial.qml
diff --git a/tests/manual/testbench/controls/Dialog.qml b/tests/manual/quickcontrols2/testbench/controls/Dialog.qml
index 0ea9d3be79..0ea9d3be79 100644
--- a/tests/manual/testbench/controls/Dialog.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Dialog.qml
diff --git a/tests/manual/testbench/controls/Frame.qml b/tests/manual/quickcontrols2/testbench/controls/Frame.qml
index dd88c3b8f3..dd88c3b8f3 100644
--- a/tests/manual/testbench/controls/Frame.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Frame.qml
diff --git a/tests/manual/testbench/controls/GroupBox.qml b/tests/manual/quickcontrols2/testbench/controls/GroupBox.qml
index 80ced76926..80ced76926 100644
--- a/tests/manual/testbench/controls/GroupBox.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/GroupBox.qml
diff --git a/tests/manual/testbench/controls/ItemDelegate.qml b/tests/manual/quickcontrols2/testbench/controls/ItemDelegate.qml
index 0b887e2f96..0b887e2f96 100644
--- a/tests/manual/testbench/controls/ItemDelegate.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ItemDelegate.qml
diff --git a/tests/manual/testbench/controls/Label.qml b/tests/manual/quickcontrols2/testbench/controls/Label.qml
index d8155a2016..d8155a2016 100644
--- a/tests/manual/testbench/controls/Label.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Label.qml
diff --git a/tests/manual/testbench/controls/Menu.qml b/tests/manual/quickcontrols2/testbench/controls/Menu.qml
index ba15c052d3..ba15c052d3 100644
--- a/tests/manual/testbench/controls/Menu.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Menu.qml
diff --git a/tests/manual/testbench/controls/MenuBar.qml b/tests/manual/quickcontrols2/testbench/controls/MenuBar.qml
index f435c9a5ae..f435c9a5ae 100644
--- a/tests/manual/testbench/controls/MenuBar.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/MenuBar.qml
diff --git a/tests/manual/testbench/controls/Page.qml b/tests/manual/quickcontrols2/testbench/controls/Page.qml
index 3d310676c3..3d310676c3 100644
--- a/tests/manual/testbench/controls/Page.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Page.qml
diff --git a/tests/manual/testbench/controls/PageIndicator.qml b/tests/manual/quickcontrols2/testbench/controls/PageIndicator.qml
index 5de29ef10b..5de29ef10b 100644
--- a/tests/manual/testbench/controls/PageIndicator.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/PageIndicator.qml
diff --git a/tests/manual/testbench/controls/Pane.qml b/tests/manual/quickcontrols2/testbench/controls/Pane.qml
index b5329b71da..b5329b71da 100644
--- a/tests/manual/testbench/controls/Pane.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Pane.qml
diff --git a/tests/manual/testbench/controls/ProgressBar.qml b/tests/manual/quickcontrols2/testbench/controls/ProgressBar.qml
index bc2d904589..bc2d904589 100644
--- a/tests/manual/testbench/controls/ProgressBar.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ProgressBar.qml
diff --git a/tests/manual/testbench/controls/RadioButton.qml b/tests/manual/quickcontrols2/testbench/controls/RadioButton.qml
index 7ca9bd0a8b..7ca9bd0a8b 100644
--- a/tests/manual/testbench/controls/RadioButton.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/RadioButton.qml
diff --git a/tests/manual/testbench/controls/RadioDelegate.qml b/tests/manual/quickcontrols2/testbench/controls/RadioDelegate.qml
index ddafd14c69..ddafd14c69 100644
--- a/tests/manual/testbench/controls/RadioDelegate.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/RadioDelegate.qml
diff --git a/tests/manual/testbench/controls/RangeSlider.qml b/tests/manual/quickcontrols2/testbench/controls/RangeSlider.qml
index 71208fb822..71208fb822 100644
--- a/tests/manual/testbench/controls/RangeSlider.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/RangeSlider.qml
diff --git a/tests/manual/testbench/controls/RoundButton.qml b/tests/manual/quickcontrols2/testbench/controls/RoundButton.qml
index fb2d1d4396..fb2d1d4396 100644
--- a/tests/manual/testbench/controls/RoundButton.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/RoundButton.qml
diff --git a/tests/manual/testbench/controls/ScrollBar.qml b/tests/manual/quickcontrols2/testbench/controls/ScrollBar.qml
index 4ed80f750e..4ed80f750e 100644
--- a/tests/manual/testbench/controls/ScrollBar.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ScrollBar.qml
diff --git a/tests/manual/testbench/controls/ScrollIndicator.qml b/tests/manual/quickcontrols2/testbench/controls/ScrollIndicator.qml
index d9ee487d08..d9ee487d08 100644
--- a/tests/manual/testbench/controls/ScrollIndicator.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ScrollIndicator.qml
diff --git a/tests/manual/testbench/controls/Slider.qml b/tests/manual/quickcontrols2/testbench/controls/Slider.qml
index 21e751acd7..21e751acd7 100644
--- a/tests/manual/testbench/controls/Slider.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Slider.qml
diff --git a/tests/manual/testbench/controls/SpinBox.qml b/tests/manual/quickcontrols2/testbench/controls/SpinBox.qml
index 22ca6ccefc..22ca6ccefc 100644
--- a/tests/manual/testbench/controls/SpinBox.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/SpinBox.qml
diff --git a/tests/manual/testbench/controls/SplitView.qml b/tests/manual/quickcontrols2/testbench/controls/SplitView.qml
index f2801def8f..f2801def8f 100644
--- a/tests/manual/testbench/controls/SplitView.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/SplitView.qml
diff --git a/tests/manual/testbench/controls/SwipeDelegate.qml b/tests/manual/quickcontrols2/testbench/controls/SwipeDelegate.qml
index 13d0a4437c..13d0a4437c 100644
--- a/tests/manual/testbench/controls/SwipeDelegate.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/SwipeDelegate.qml
diff --git a/tests/manual/testbench/controls/Switch.qml b/tests/manual/quickcontrols2/testbench/controls/Switch.qml
index 6e877a4995..6e877a4995 100644
--- a/tests/manual/testbench/controls/Switch.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Switch.qml
diff --git a/tests/manual/testbench/controls/SwitchDelegate.qml b/tests/manual/quickcontrols2/testbench/controls/SwitchDelegate.qml
index 4f60da5537..4f60da5537 100644
--- a/tests/manual/testbench/controls/SwitchDelegate.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/SwitchDelegate.qml
diff --git a/tests/manual/testbench/controls/TabBar.qml b/tests/manual/quickcontrols2/testbench/controls/TabBar.qml
index a7a1de490a..a7a1de490a 100644
--- a/tests/manual/testbench/controls/TabBar.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/TabBar.qml
diff --git a/tests/manual/testbench/controls/TextArea.qml b/tests/manual/quickcontrols2/testbench/controls/TextArea.qml
index dfe28f79f4..dfe28f79f4 100644
--- a/tests/manual/testbench/controls/TextArea.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/TextArea.qml
diff --git a/tests/manual/testbench/controls/TextField.qml b/tests/manual/quickcontrols2/testbench/controls/TextField.qml
index 1eed3a6c4a..1eed3a6c4a 100644
--- a/tests/manual/testbench/controls/TextField.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/TextField.qml
diff --git a/tests/manual/testbench/controls/ToolBar.qml b/tests/manual/quickcontrols2/testbench/controls/ToolBar.qml
index 3aba337782..3aba337782 100644
--- a/tests/manual/testbench/controls/ToolBar.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ToolBar.qml
diff --git a/tests/manual/testbench/controls/ToolTip.qml b/tests/manual/quickcontrols2/testbench/controls/ToolTip.qml
index ddcf92f860..ddcf92f860 100644
--- a/tests/manual/testbench/controls/ToolTip.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/ToolTip.qml
diff --git a/tests/manual/testbench/controls/Tumbler.qml b/tests/manual/quickcontrols2/testbench/controls/Tumbler.qml
index a2dbebef27..a2dbebef27 100644
--- a/tests/manual/testbench/controls/Tumbler.qml
+++ b/tests/manual/quickcontrols2/testbench/controls/Tumbler.qml
diff --git a/tests/manual/testbench/deployment.pri b/tests/manual/quickcontrols2/testbench/deployment.pri
index c89af25a85..c89af25a85 100644
--- a/tests/manual/testbench/deployment.pri
+++ b/tests/manual/quickcontrols2/testbench/deployment.pri
diff --git a/tests/manual/testbench/directoryvalidator.cpp b/tests/manual/quickcontrols2/testbench/directoryvalidator.cpp
index d0d4cd8d57..d0d4cd8d57 100644
--- a/tests/manual/testbench/directoryvalidator.cpp
+++ b/tests/manual/quickcontrols2/testbench/directoryvalidator.cpp
diff --git a/tests/manual/testbench/directoryvalidator.h b/tests/manual/quickcontrols2/testbench/directoryvalidator.h
index a1650d863f..a1650d863f 100644
--- a/tests/manual/testbench/directoryvalidator.h
+++ b/tests/manual/quickcontrols2/testbench/directoryvalidator.h
diff --git a/tests/manual/testbench/fonts.qrc b/tests/manual/quickcontrols2/testbench/fonts.qrc
index fc86e03183..fc86e03183 100644
--- a/tests/manual/testbench/fonts.qrc
+++ b/tests/manual/quickcontrols2/testbench/fonts.qrc
diff --git a/tests/manual/testbench/fonts/LICENSE.txt b/tests/manual/quickcontrols2/testbench/fonts/LICENSE.txt
index 8fa3da363e..8fa3da363e 100644
--- a/tests/manual/testbench/fonts/LICENSE.txt
+++ b/tests/manual/quickcontrols2/testbench/fonts/LICENSE.txt
diff --git a/tests/manual/testbench/fonts/fontawesome.ttf b/tests/manual/quickcontrols2/testbench/fonts/fontawesome.ttf
index 49b6c5da65..49b6c5da65 100644
--- a/tests/manual/testbench/fonts/fontawesome.ttf
+++ b/tests/manual/quickcontrols2/testbench/fonts/fontawesome.ttf
diff --git a/tests/manual/testbench/main.cpp b/tests/manual/quickcontrols2/testbench/main.cpp
index ddad828f30..ddad828f30 100644
--- a/tests/manual/testbench/main.cpp
+++ b/tests/manual/quickcontrols2/testbench/main.cpp
diff --git a/tests/manual/testbench/qml.qrc b/tests/manual/quickcontrols2/testbench/qml.qrc
index 82e69be6f3..82e69be6f3 100644
--- a/tests/manual/testbench/qml.qrc
+++ b/tests/manual/quickcontrols2/testbench/qml.qrc
diff --git a/tests/manual/testbench/testbench.pro b/tests/manual/quickcontrols2/testbench/testbench.pro
index 4509f4967d..4509f4967d 100644
--- a/tests/manual/testbench/testbench.pro
+++ b/tests/manual/quickcontrols2/testbench/testbench.pro
diff --git a/tests/manual/testbench/testbench.qml b/tests/manual/quickcontrols2/testbench/testbench.qml
index 8f0951adae..8f0951adae 100644
--- a/tests/manual/testbench/testbench.qml
+++ b/tests/manual/quickcontrols2/testbench/testbench.qml
diff --git a/tests/manual/viewinqwidget/CMakeLists.txt b/tests/manual/quickcontrols2/viewinqwidget/CMakeLists.txt
index f91b0d8c02..f91b0d8c02 100644
--- a/tests/manual/viewinqwidget/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/viewinqwidget/CMakeLists.txt
diff --git a/tests/manual/viewinqwidget/main.cpp b/tests/manual/quickcontrols2/viewinqwidget/main.cpp
index b6b7a5ff02..b6b7a5ff02 100644
--- a/tests/manual/viewinqwidget/main.cpp
+++ b/tests/manual/quickcontrols2/viewinqwidget/main.cpp
diff --git a/tests/manual/viewinqwidget/main.qml b/tests/manual/quickcontrols2/viewinqwidget/main.qml
index 5ac170b320..5ac170b320 100644
--- a/tests/manual/viewinqwidget/main.qml
+++ b/tests/manual/quickcontrols2/viewinqwidget/main.qml
diff --git a/tests/manual/viewinqwidget/viewinqwidget.pro b/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.pro
index 649829d449..649829d449 100644
--- a/tests/manual/viewinqwidget/viewinqwidget.pro
+++ b/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.pro
diff --git a/tests/manual/viewinqwidget/viewinqwidget.qrc b/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.qrc
index 5f6483ac33..5f6483ac33 100644
--- a/tests/manual/viewinqwidget/viewinqwidget.qrc
+++ b/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.qrc