837 files changed, 39 insertions, 39 deletions

diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 1793aa464a..1f80a6e2e8 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -34,6 +34,6 @@ if(TARGET Qt::QmlDomPrivate AND NOT CMAKE_CROSSCOMPILING)
     add_subdirectory(qmlls)
 endif()
 if(TARGET Qt::QuickTemplates2)
-    add_subdirectory(quickcontrols2)
+    add_subdirectory(quickcontrols)
     add_subdirectory(quickdialogs)
 endif()
diff --git a/tests/auto/qml/qmlformat/tst_qmlformat.cpp b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
index 450e50465e..ab67ee9fdb 100644
--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
@@ -139,7 +139,7 @@ void TestQmlformat::initTestCase()
     // Optional chains are not permitted on the left-hand-side in assignments
     m_invalidFiles << "tests/auto/qml/qqmllanguage/data/optionalChaining.LHS.qml";
     // object literal with = assignements
-    m_invalidFiles << "tests/auto/quickcontrols2/controls/data/tst_scrollbar.qml";
+    m_invalidFiles << "tests/auto/quickcontrols/controls/data/tst_scrollbar.qml";
 
     // These files rely on exact formatting
     m_invalidFiles << "tests/auto/qml/qqmlecmascript/data/incrDecrSemicolon1.qml";
diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index 473b363004..de27fe92cb 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -60,9 +60,9 @@ tst_examples::tst_examples()
     excludedDirs << "snippets/qml/visualdatamodel_rootindex";
     excludedDirs << "snippets/qml/qtbinding";
     excludedDirs << "snippets/qml/imports";
-    excludedDirs << "examples/quickcontrols2/imagine";
-    excludedDirs << "examples/quickcontrols2/texteditor";
-    excludedDirs << "examples/quickcontrols2/ios/todolist"; // Must be run via executable.
+    excludedDirs << "examples/quickcontrols/imagine";
+    excludedDirs << "examples/quickcontrols/texteditor";
+    excludedDirs << "examples/quickcontrols/ios/todolist"; // Must be run via executable.
     excludedFiles << "snippets/qml/image-ext.qml";
     excludedFiles << "examples/quick/shapes/content/main.qml"; // relies on resources
     excludedFiles << "examples/quick/shapes/content/interactive.qml"; // relies on resources
diff --git a/tests/auto/quickcontrols2/CMakeLists.txt b/tests/auto/quickcontrols/CMakeLists.txt
index 10a5604649..10a5604649 100644
--- a/tests/auto/quickcontrols2/CMakeLists.txt
+++ b/tests/auto/quickcontrols/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/accessibility/BLACKLIST b/tests/auto/quickcontrols/accessibility/BLACKLIST
index fe7a87f847..fe7a87f847 100644
--- a/tests/auto/quickcontrols2/accessibility/BLACKLIST
+++ b/tests/auto/quickcontrols/accessibility/BLACKLIST
diff --git a/tests/auto/quickcontrols2/accessibility/CMakeLists.txt b/tests/auto/quickcontrols/accessibility/CMakeLists.txt
index 2a47abd632..b6f89cb964 100644
--- a/tests/auto/quickcontrols2/accessibility/CMakeLists.txt
+++ b/tests/auto/quickcontrols/accessibility/CMakeLists.txt
@@ -27,7 +27,7 @@ qt_internal_add_test(tst_accessibility
     SOURCES
         tst_accessibility.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/abstractbutton.qml b/tests/auto/quickcontrols/accessibility/data/defaults/abstractbutton.qml
index 29d6b3c0a0..29d6b3c0a0 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/abstractbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/abstractbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/busyindicator.qml b/tests/auto/quickcontrols/accessibility/data/defaults/busyindicator.qml
index baaa9ba80b..baaa9ba80b 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/busyindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/busyindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/button.qml b/tests/auto/quickcontrols/accessibility/data/defaults/button.qml
index 0359b3ac15..0359b3ac15 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/button.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/button.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/checkbox.qml b/tests/auto/quickcontrols/accessibility/data/defaults/checkbox.qml
index c912be5791..c912be5791 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/checkbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/checkbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/checkdelegate.qml b/tests/auto/quickcontrols/accessibility/data/defaults/checkdelegate.qml
index df62bc89d5..df62bc89d5 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/checkdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/checkdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/combobox.qml b/tests/auto/quickcontrols/accessibility/data/defaults/combobox.qml
index bfeac723da..bfeac723da 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/combobox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/combobox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/container.qml b/tests/auto/quickcontrols/accessibility/data/defaults/container.qml
index 7d29fec426..7d29fec426 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/container.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/container.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/control.qml b/tests/auto/quickcontrols/accessibility/data/defaults/control.qml
index 280cfd2962..280cfd2962 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/control.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/control.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/dial.qml b/tests/auto/quickcontrols/accessibility/data/defaults/dial.qml
index d7e700b5df..d7e700b5df 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/dial.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/dial.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/dialog.qml b/tests/auto/quickcontrols/accessibility/data/defaults/dialog.qml
index d88fd36d8e..d88fd36d8e 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/dialog.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/dialog.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/drawer.qml b/tests/auto/quickcontrols/accessibility/data/defaults/drawer.qml
index 60a35171b2..60a35171b2 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/drawer.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/drawer.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/frame.qml b/tests/auto/quickcontrols/accessibility/data/defaults/frame.qml
index b70ccb556c..b70ccb556c 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/frame.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/frame.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/groupbox.qml b/tests/auto/quickcontrols/accessibility/data/defaults/groupbox.qml
index 24f3a294b8..24f3a294b8 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/groupbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/groupbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/itemdelegate.qml b/tests/auto/quickcontrols/accessibility/data/defaults/itemdelegate.qml
index 5ec95fe07e..5ec95fe07e 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/itemdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/itemdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/label.qml b/tests/auto/quickcontrols/accessibility/data/defaults/label.qml
index 5f6a98cd74..5f6a98cd74 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/label.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/label.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/menu.qml b/tests/auto/quickcontrols/accessibility/data/defaults/menu.qml
index 07fef72849..07fef72849 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/menu.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/menu.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/menuitem.qml b/tests/auto/quickcontrols/accessibility/data/defaults/menuitem.qml
index 194fa988c8..194fa988c8 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/menuitem.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/menuitem.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/page.qml b/tests/auto/quickcontrols/accessibility/data/defaults/page.qml
index cd1f78e170..cd1f78e170 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/page.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/page.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/pageindicator.qml b/tests/auto/quickcontrols/accessibility/data/defaults/pageindicator.qml
index d64d565706..d64d565706 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/pageindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/pageindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/pane.qml b/tests/auto/quickcontrols/accessibility/data/defaults/pane.qml
index 765c98a394..765c98a394 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/pane.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/pane.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/popup.qml b/tests/auto/quickcontrols/accessibility/data/defaults/popup.qml
index c599bd4c0b..c599bd4c0b 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/popup.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/popup.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/progressbar.qml b/tests/auto/quickcontrols/accessibility/data/defaults/progressbar.qml
index b3e287c33c..b3e287c33c 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/progressbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/progressbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/radiobutton.qml b/tests/auto/quickcontrols/accessibility/data/defaults/radiobutton.qml
index d796b37e17..d796b37e17 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/radiobutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/radiobutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/radiodelegate.qml b/tests/auto/quickcontrols/accessibility/data/defaults/radiodelegate.qml
index d002b98532..d002b98532 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/radiodelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/radiodelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/rangeslider.qml b/tests/auto/quickcontrols/accessibility/data/defaults/rangeslider.qml
index 7bd364c443..7bd364c443 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/rangeslider.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/rangeslider.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/roundbutton.qml b/tests/auto/quickcontrols/accessibility/data/defaults/roundbutton.qml
index 6c78c0a47d..6c78c0a47d 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/roundbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/roundbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollbar.qml b/tests/auto/quickcontrols/accessibility/data/defaults/scrollbar.qml
index c36b1534b1..c36b1534b1 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/scrollbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollindicator.qml b/tests/auto/quickcontrols/accessibility/data/defaults/scrollindicator.qml
index 5b2f44b674..5b2f44b674 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/scrollindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/scrollindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/slider.qml b/tests/auto/quickcontrols/accessibility/data/defaults/slider.qml
index fd60a19844..fd60a19844 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/slider.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/slider.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/spinbox.qml b/tests/auto/quickcontrols/accessibility/data/defaults/spinbox.qml
index 159e1f4676..159e1f4676 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/spinbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/spinbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/stackview.qml b/tests/auto/quickcontrols/accessibility/data/defaults/stackview.qml
index bd540b91a0..bd540b91a0 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/stackview.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/stackview.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/swipedelegate.qml b/tests/auto/quickcontrols/accessibility/data/defaults/swipedelegate.qml
index d3724d4dc2..d3724d4dc2 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/swipedelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/swipedelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/swipeview.qml b/tests/auto/quickcontrols/accessibility/data/defaults/swipeview.qml
index 9eb8221666..9eb8221666 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/swipeview.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/swipeview.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/switch.qml b/tests/auto/quickcontrols/accessibility/data/defaults/switch.qml
index 00213086aa..00213086aa 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/switch.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/switch.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/switchdelegate.qml b/tests/auto/quickcontrols/accessibility/data/defaults/switchdelegate.qml
index 9f71ed6848..9f71ed6848 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/switchdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/switchdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbar.qml b/tests/auto/quickcontrols/accessibility/data/defaults/tabbar.qml
index 423bfea903..423bfea903 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/tabbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbutton.qml b/tests/auto/quickcontrols/accessibility/data/defaults/tabbutton.qml
index ab9ea8ae2c..ab9ea8ae2c 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tabbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/tabbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/textarea.qml b/tests/auto/quickcontrols/accessibility/data/defaults/textarea.qml
index 9a1f31d029..9a1f31d029 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/textarea.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/textarea.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/textfield.qml b/tests/auto/quickcontrols/accessibility/data/defaults/textfield.qml
index 42a16bae78..42a16bae78 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/textfield.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/textfield.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbar.qml b/tests/auto/quickcontrols/accessibility/data/defaults/toolbar.qml
index 01b93d7d91..01b93d7d91 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/toolbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbutton.qml b/tests/auto/quickcontrols/accessibility/data/defaults/toolbutton.qml
index 40e1152edc..40e1152edc 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/toolbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/toolbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tooltip.qml b/tests/auto/quickcontrols/accessibility/data/defaults/tooltip.qml
index f1c3cebee5..f1c3cebee5 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tooltip.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/tooltip.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/defaults/tumbler.qml b/tests/auto/quickcontrols/accessibility/data/defaults/tumbler.qml
index e3db175bd2..e3db175bd2 100644
--- a/tests/auto/quickcontrols2/accessibility/data/defaults/tumbler.qml
+++ b/tests/auto/quickcontrols/accessibility/data/defaults/tumbler.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/ordering/page.qml b/tests/auto/quickcontrols/accessibility/data/ordering/page.qml
index 8efafe3232..8efafe3232 100644
--- a/tests/auto/quickcontrols2/accessibility/data/ordering/page.qml
+++ b/tests/auto/quickcontrols/accessibility/data/ordering/page.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/abstractbutton.qml b/tests/auto/quickcontrols/accessibility/data/override/abstractbutton.qml
index ac8efe2601..ac8efe2601 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/abstractbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/abstractbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/busyindicator.qml b/tests/auto/quickcontrols/accessibility/data/override/busyindicator.qml
index 439788d121..439788d121 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/busyindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/busyindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/button.qml b/tests/auto/quickcontrols/accessibility/data/override/button.qml
index 578af86c78..578af86c78 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/button.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/button.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/checkbox.qml b/tests/auto/quickcontrols/accessibility/data/override/checkbox.qml
index 5df735091e..5df735091e 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/checkbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/checkbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/checkdelegate.qml b/tests/auto/quickcontrols/accessibility/data/override/checkdelegate.qml
index 43f65d5083..43f65d5083 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/checkdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/checkdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/combobox.qml b/tests/auto/quickcontrols/accessibility/data/override/combobox.qml
index fa6ed3b4bf..fa6ed3b4bf 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/combobox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/combobox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/container.qml b/tests/auto/quickcontrols/accessibility/data/override/container.qml
index 4e73f341d6..4e73f341d6 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/container.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/container.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/control.qml b/tests/auto/quickcontrols/accessibility/data/override/control.qml
index 9c2be4617f..9c2be4617f 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/control.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/control.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/dial.qml b/tests/auto/quickcontrols/accessibility/data/override/dial.qml
index 8dbf0e3764..8dbf0e3764 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/dial.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/dial.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/dialog.qml b/tests/auto/quickcontrols/accessibility/data/override/dialog.qml
index d1f3197196..d1f3197196 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/dialog.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/dialog.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/drawer.qml b/tests/auto/quickcontrols/accessibility/data/override/drawer.qml
index 02e973e2cc..02e973e2cc 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/drawer.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/drawer.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/frame.qml b/tests/auto/quickcontrols/accessibility/data/override/frame.qml
index 55086b35c0..55086b35c0 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/frame.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/frame.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/groupbox.qml b/tests/auto/quickcontrols/accessibility/data/override/groupbox.qml
index d09d0845c9..d09d0845c9 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/groupbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/groupbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/itemdelegate.qml b/tests/auto/quickcontrols/accessibility/data/override/itemdelegate.qml
index 2f32cb7514..2f32cb7514 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/itemdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/itemdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/label.qml b/tests/auto/quickcontrols/accessibility/data/override/label.qml
index 5c1310f875..5c1310f875 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/label.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/label.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/menu.qml b/tests/auto/quickcontrols/accessibility/data/override/menu.qml
index 57a1b3d61f..57a1b3d61f 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/menu.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/menu.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/menuitem.qml b/tests/auto/quickcontrols/accessibility/data/override/menuitem.qml
index e1c064f3b5..e1c064f3b5 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/menuitem.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/menuitem.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/page.qml b/tests/auto/quickcontrols/accessibility/data/override/page.qml
index b3b87e8ab6..b3b87e8ab6 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/page.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/page.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/pageindicator.qml b/tests/auto/quickcontrols/accessibility/data/override/pageindicator.qml
index f366464df7..f366464df7 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/pageindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/pageindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/pane.qml b/tests/auto/quickcontrols/accessibility/data/override/pane.qml
index 7b57e9a9f5..7b57e9a9f5 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/pane.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/pane.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/popup.qml b/tests/auto/quickcontrols/accessibility/data/override/popup.qml
index 9d8d58550a..9d8d58550a 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/popup.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/popup.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/progressbar.qml b/tests/auto/quickcontrols/accessibility/data/override/progressbar.qml
index 58bd2ae1bd..58bd2ae1bd 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/progressbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/progressbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/radiobutton.qml b/tests/auto/quickcontrols/accessibility/data/override/radiobutton.qml
index 3c555256b8..3c555256b8 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/radiobutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/radiobutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/radiodelegate.qml b/tests/auto/quickcontrols/accessibility/data/override/radiodelegate.qml
index 883f963c5c..883f963c5c 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/radiodelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/radiodelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/rangeslider.qml b/tests/auto/quickcontrols/accessibility/data/override/rangeslider.qml
index 675c34aad1..675c34aad1 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/rangeslider.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/rangeslider.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/roundbutton.qml b/tests/auto/quickcontrols/accessibility/data/override/roundbutton.qml
index a793ee2833..a793ee2833 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/roundbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/roundbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/scrollbar.qml b/tests/auto/quickcontrols/accessibility/data/override/scrollbar.qml
index 6b3e613c42..6b3e613c42 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/scrollbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/scrollbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/scrollindicator.qml b/tests/auto/quickcontrols/accessibility/data/override/scrollindicator.qml
index 5cc1e5d4b8..5cc1e5d4b8 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/scrollindicator.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/scrollindicator.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/slider.qml b/tests/auto/quickcontrols/accessibility/data/override/slider.qml
index 9239f8db99..9239f8db99 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/slider.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/slider.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/spinbox.qml b/tests/auto/quickcontrols/accessibility/data/override/spinbox.qml
index 327f2a6d4a..327f2a6d4a 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/spinbox.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/spinbox.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/stackview.qml b/tests/auto/quickcontrols/accessibility/data/override/stackview.qml
index dd3b8342f7..dd3b8342f7 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/stackview.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/stackview.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/swipedelegate.qml b/tests/auto/quickcontrols/accessibility/data/override/swipedelegate.qml
index bc97fc93bc..bc97fc93bc 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/swipedelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/swipedelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/swipeview.qml b/tests/auto/quickcontrols/accessibility/data/override/swipeview.qml
index 809b536210..809b536210 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/swipeview.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/swipeview.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/switch.qml b/tests/auto/quickcontrols/accessibility/data/override/switch.qml
index 18e3eb70ce..18e3eb70ce 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/switch.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/switch.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/switchdelegate.qml b/tests/auto/quickcontrols/accessibility/data/override/switchdelegate.qml
index 0c66f9e9e9..0c66f9e9e9 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/switchdelegate.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/switchdelegate.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tabbar.qml b/tests/auto/quickcontrols/accessibility/data/override/tabbar.qml
index a959f68cae..a959f68cae 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/tabbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/tabbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tabbutton.qml b/tests/auto/quickcontrols/accessibility/data/override/tabbutton.qml
index 1530a2d1bc..1530a2d1bc 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/tabbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/tabbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/textarea.qml b/tests/auto/quickcontrols/accessibility/data/override/textarea.qml
index 2b1422252f..2b1422252f 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/textarea.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/textarea.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/textfield.qml b/tests/auto/quickcontrols/accessibility/data/override/textfield.qml
index 42098b6640..42098b6640 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/textfield.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/textfield.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/toolbar.qml b/tests/auto/quickcontrols/accessibility/data/override/toolbar.qml
index 97406f8ca5..97406f8ca5 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/toolbar.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/toolbar.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/toolbutton.qml b/tests/auto/quickcontrols/accessibility/data/override/toolbutton.qml
index 5ecb427baf..5ecb427baf 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/toolbutton.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/toolbutton.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tooltip.qml b/tests/auto/quickcontrols/accessibility/data/override/tooltip.qml
index 1a4c3a994f..1a4c3a994f 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/tooltip.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/tooltip.qml
diff --git a/tests/auto/quickcontrols2/accessibility/data/override/tumbler.qml b/tests/auto/quickcontrols/accessibility/data/override/tumbler.qml
index 947f66cd70..947f66cd70 100644
--- a/tests/auto/quickcontrols2/accessibility/data/override/tumbler.qml
+++ b/tests/auto/quickcontrols/accessibility/data/override/tumbler.qml
diff --git a/tests/auto/quickcontrols2/accessibility/tst_accessibility.cpp b/tests/auto/quickcontrols/accessibility/tst_accessibility.cpp
index 40ee98691d..40ee98691d 100644
--- a/tests/auto/quickcontrols2/accessibility/tst_accessibility.cpp
+++ b/tests/auto/quickcontrols/accessibility/tst_accessibility.cpp
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt
index 1b41ce037f..1b41ce037f 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.10.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt
index 4c7accb315..4c7accb315 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.11.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt
index fdac69d643..fdac69d643 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.12.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt
index 07ba810c43..07ba810c43 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.13.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt
index db7b454b59..db7b454b59 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.5.14.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt b/tests/auto/quickcontrols/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt
index 21b78d6349..21b78d6349 100644
--- a/tests/auto/quickcontrols2/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt
+++ b/tests/auto/quickcontrols/bic/data/QtQuickControls2.6.0.0.linux-gcc-amd64.txt
diff --git a/tests/auto/quickcontrols2/cmake/CMakeLists.txt b/tests/auto/quickcontrols/cmake/CMakeLists.txt
index 93ecd12386..93ecd12386 100644
--- a/tests/auto/quickcontrols2/cmake/CMakeLists.txt
+++ b/tests/auto/quickcontrols/cmake/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/CMakeLists.txt b/tests/auto/quickcontrols/controls/CMakeLists.txt
index 6984315b5a..6984315b5a 100644
--- a/tests/auto/quickcontrols2/controls/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/basic/BLACKLIST b/tests/auto/quickcontrols/controls/basic/BLACKLIST
index b643dd1d9c..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/basic/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/basic/CMakeLists.txt b/tests/auto/quickcontrols/controls/basic/CMakeLists.txt
index b391d278ae..b391d278ae 100644
--- a/tests/auto/quickcontrols2/controls/basic/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/basic/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/basic/dependencies.qml b/tests/auto/quickcontrols/controls/basic/dependencies.qml
index f7d87422b5..f7d87422b5 100644
--- a/tests/auto/quickcontrols2/controls/basic/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/basic/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/basic/dummy_imports.qml b/tests/auto/quickcontrols/controls/basic/dummy_imports.qml
index 66e184f138..66e184f138 100644
--- a/tests/auto/quickcontrols2/controls/basic/dummy_imports.qml
+++ b/tests/auto/quickcontrols/controls/basic/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/controls/basic/tst_basic.cpp b/tests/auto/quickcontrols/controls/basic/tst_basic.cpp
index 47cd9a393e..47cd9a393e 100644
--- a/tests/auto/quickcontrols2/controls/basic/tst_basic.cpp
+++ b/tests/auto/quickcontrols/controls/basic/tst_basic.cpp
diff --git a/tests/auto/quickcontrols2/controls/data/SignalSequenceSpy.qml b/tests/auto/quickcontrols/controls/data/SignalSequenceSpy.qml
index 5e536248a8..5e536248a8 100644
--- a/tests/auto/quickcontrols2/controls/data/SignalSequenceSpy.qml
+++ b/tests/auto/quickcontrols/controls/data/SignalSequenceSpy.qml
diff --git a/tests/auto/quickcontrols2/controls/data/TestItem.qml b/tests/auto/quickcontrols/controls/data/TestItem.qml
index c36ddc2f11..c36ddc2f11 100644
--- a/tests/auto/quickcontrols2/controls/data/TestItem.qml
+++ b/tests/auto/quickcontrols/controls/data/TestItem.qml
diff --git a/tests/auto/quickcontrols2/controls/data/TumblerDatePicker.qml b/tests/auto/quickcontrols/controls/data/TumblerDatePicker.qml
index c1b12e8fbc..c1b12e8fbc 100644
--- a/tests/auto/quickcontrols2/controls/data/TumblerDatePicker.qml
+++ b/tests/auto/quickcontrols/controls/data/TumblerDatePicker.qml
diff --git a/tests/auto/quickcontrols2/controls/data/TumblerListView.qml b/tests/auto/quickcontrols/controls/data/TumblerListView.qml
index a794f255db..a794f255db 100644
--- a/tests/auto/quickcontrols2/controls/data/TumblerListView.qml
+++ b/tests/auto/quickcontrols/controls/data/TumblerListView.qml
diff --git a/tests/auto/quickcontrols2/controls/data/TumblerPathView.qml b/tests/auto/quickcontrols/controls/data/TumblerPathView.qml
index 26de69dab2..26de69dab2 100644
--- a/tests/auto/quickcontrols2/controls/data/TumblerPathView.qml
+++ b/tests/auto/quickcontrols/controls/data/TumblerPathView.qml
diff --git a/tests/auto/quickcontrols2/controls/data/splitview/fillItemInMiddle.qml b/tests/auto/quickcontrols/controls/data/splitview/fillItemInMiddle.qml
index 1849e66e1c..1849e66e1c 100644
--- a/tests/auto/quickcontrols2/controls/data/splitview/fillItemInMiddle.qml
+++ b/tests/auto/quickcontrols/controls/data/splitview/fillItemInMiddle.qml
diff --git a/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnLeft.qml b/tests/auto/quickcontrols/controls/data/splitview/fillItemOnLeft.qml
index 8307a05951..8307a05951 100644
--- a/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnLeft.qml
+++ b/tests/auto/quickcontrols/controls/data/splitview/fillItemOnLeft.qml
diff --git a/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnTop.qml b/tests/auto/quickcontrols/controls/data/splitview/fillItemOnTop.qml
index 41ce0f386e..41ce0f386e 100644
--- a/tests/auto/quickcontrols2/controls/data/splitview/fillItemOnTop.qml
+++ b/tests/auto/quickcontrols/controls/data/splitview/fillItemOnTop.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_abstractbutton.qml b/tests/auto/quickcontrols/controls/data/tst_abstractbutton.qml
index 663b152c70..663b152c70 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_abstractbutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_abstractbutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_action.qml b/tests/auto/quickcontrols/controls/data/tst_action.qml
index 845a6507af..845a6507af 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_action.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_action.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_actiongroup.qml b/tests/auto/quickcontrols/controls/data/tst_actiongroup.qml
index 4b5fdc7d65..4b5fdc7d65 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_actiongroup.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_actiongroup.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_busyindicator.qml b/tests/auto/quickcontrols/controls/data/tst_busyindicator.qml
index a50fd1bfab..a50fd1bfab 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_busyindicator.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_busyindicator.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_button.qml b/tests/auto/quickcontrols/controls/data/tst_button.qml
index 9ddfa0885d..9ddfa0885d 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_button.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_button.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_buttongroup.qml b/tests/auto/quickcontrols/controls/data/tst_buttongroup.qml
index 2ae86d1737..2ae86d1737 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_buttongroup.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_buttongroup.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_calendarmodel.qml b/tests/auto/quickcontrols/controls/data/tst_calendarmodel.qml
index 19070e074d..19070e074d 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_calendarmodel.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_calendarmodel.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_checkbox.qml b/tests/auto/quickcontrols/controls/data/tst_checkbox.qml
index 5991ae9008..5991ae9008 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_checkbox.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_checkbox.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_checkdelegate.qml b/tests/auto/quickcontrols/controls/data/tst_checkdelegate.qml
index d3e0910e83..d3e0910e83 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_checkdelegate.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_checkdelegate.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_combobox.qml b/tests/auto/quickcontrols/controls/data/tst_combobox.qml
index 058a07a070..058a07a070 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_combobox.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_combobox.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_container.qml b/tests/auto/quickcontrols/controls/data/tst_container.qml
index 9988625744..9988625744 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_container.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_container.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_control.qml b/tests/auto/quickcontrols/controls/data/tst_control.qml
index 0747943421..0747943421 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_control.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_control.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_dayofweekrow.qml b/tests/auto/quickcontrols/controls/data/tst_dayofweekrow.qml
index 67403e240a..67403e240a 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_dayofweekrow.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_dayofweekrow.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_delaybutton.qml b/tests/auto/quickcontrols/controls/data/tst_delaybutton.qml
index e2abe389ca..e2abe389ca 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_delaybutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_delaybutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_dial.qml b/tests/auto/quickcontrols/controls/data/tst_dial.qml
index 3fcf8c7e88..3fcf8c7e88 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_dial.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_dial.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_dialog.qml b/tests/auto/quickcontrols/controls/data/tst_dialog.qml
index 76ff95a32a..76ff95a32a 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_dialog.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_dialog.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_dialogbuttonbox.qml b/tests/auto/quickcontrols/controls/data/tst_dialogbuttonbox.qml
index 6eb339a192..6eb339a192 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_dialogbuttonbox.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_frame.qml b/tests/auto/quickcontrols/controls/data/tst_frame.qml
index bef46f7650..bef46f7650 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_frame.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_frame.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_groupbox.qml b/tests/auto/quickcontrols/controls/data/tst_groupbox.qml
index b5867dd956..b5867dd956 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_groupbox.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_groupbox.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_itemdelegate.qml b/tests/auto/quickcontrols/controls/data/tst_itemdelegate.qml
index 9d4847b4b1..9d4847b4b1 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_itemdelegate.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_itemdelegate.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_label.qml b/tests/auto/quickcontrols/controls/data/tst_label.qml
index 853d5ba686..853d5ba686 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_label.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_label.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_menuitem.qml b/tests/auto/quickcontrols/controls/data/tst_menuitem.qml
index d1ed076705..d1ed076705 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_menuitem.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_menuitem.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_monthgrid.qml b/tests/auto/quickcontrols/controls/data/tst_monthgrid.qml
index 5b1081675e..5b1081675e 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_monthgrid.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_monthgrid.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_page.qml b/tests/auto/quickcontrols/controls/data/tst_page.qml
index ca816d963b..ca816d963b 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_page.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_page.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_pageindicator.qml b/tests/auto/quickcontrols/controls/data/tst_pageindicator.qml
index 837972cdc2..837972cdc2 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_pageindicator.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_pageindicator.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_pane.qml b/tests/auto/quickcontrols/controls/data/tst_pane.qml
index f823031c79..f823031c79 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_pane.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_pane.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_popup.qml b/tests/auto/quickcontrols/controls/data/tst_popup.qml
index 9c1d63ffe4..9c1d63ffe4 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_popup.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_popup.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_progressbar.qml b/tests/auto/quickcontrols/controls/data/tst_progressbar.qml
index 6484df815a..6484df815a 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_progressbar.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_progressbar.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_radiobutton.qml b/tests/auto/quickcontrols/controls/data/tst_radiobutton.qml
index 08caac977d..08caac977d 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_radiobutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_radiobutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_radiodelegate.qml b/tests/auto/quickcontrols/controls/data/tst_radiodelegate.qml
index fe89838bda..fe89838bda 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_radiodelegate.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_radiodelegate.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml b/tests/auto/quickcontrols/controls/data/tst_rangeslider.qml
index 91e366c819..91e366c819 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_rangeslider.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_roundbutton.qml b/tests/auto/quickcontrols/controls/data/tst_roundbutton.qml
index dfdd62086d..dfdd62086d 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_roundbutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_roundbutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_scrollbar.qml b/tests/auto/quickcontrols/controls/data/tst_scrollbar.qml
index f26d8f5cb0..f26d8f5cb0 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_scrollbar.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_scrollbar.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_scrollindicator.qml b/tests/auto/quickcontrols/controls/data/tst_scrollindicator.qml
index d87e29f980..d87e29f980 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_scrollindicator.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_scrollindicator.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_scrollview.qml b/tests/auto/quickcontrols/controls/data/tst_scrollview.qml
index e5600830a8..e5600830a8 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_scrollview.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_scrollview.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_selectionrectangle.qml b/tests/auto/quickcontrols/controls/data/tst_selectionrectangle.qml
index 9203528d07..9203528d07 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_selectionrectangle.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_selectionrectangle.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_slider.qml b/tests/auto/quickcontrols/controls/data/tst_slider.qml
index df3eb71ae2..df3eb71ae2 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_slider.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_slider.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_spinbox.qml b/tests/auto/quickcontrols/controls/data/tst_spinbox.qml
index df30ef4beb..df30ef4beb 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_spinbox.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_spinbox.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_splitview.qml b/tests/auto/quickcontrols/controls/data/tst_splitview.qml
index 2cdd28457f..37d05d1130 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_splitview.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_splitview.qml
@@ -18,7 +18,7 @@ TestCase {
 
     function initTestCase() {
         // For the serialization tests.
-        Qt.application.name = "qtquickcontrols2-splitview-auto-test"
+        Qt.application.name = "qtquickcontrols-splitview-auto-test"
         Qt.application.domain = "org.qt-project"
         Qt.application.organization = "QtProject"
     }
diff --git a/tests/auto/quickcontrols2/controls/data/tst_stackview.qml b/tests/auto/quickcontrols/controls/data/tst_stackview.qml
index 8584385cbf..8584385cbf 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_stackview.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_stackview.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_swipedelegate.qml b/tests/auto/quickcontrols/controls/data/tst_swipedelegate.qml
index 901170bf9f..901170bf9f 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_swipedelegate.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_swipeview.qml b/tests/auto/quickcontrols/controls/data/tst_swipeview.qml
index c853f6dd55..c853f6dd55 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_swipeview.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_swipeview.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_switch.qml b/tests/auto/quickcontrols/controls/data/tst_switch.qml
index 407513b914..407513b914 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_switch.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_switch.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_switchdelegate.qml b/tests/auto/quickcontrols/controls/data/tst_switchdelegate.qml
index 42d58b9668..42d58b9668 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_switchdelegate.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_tabbar.qml b/tests/auto/quickcontrols/controls/data/tst_tabbar.qml
index 58c0b1ae61..58c0b1ae61 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_tabbar.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_tabbar.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_tabbutton.qml b/tests/auto/quickcontrols/controls/data/tst_tabbutton.qml
index 591622b8a2..591622b8a2 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_tabbutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_tabbutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_textarea.qml b/tests/auto/quickcontrols/controls/data/tst_textarea.qml
index 0f295905f1..0f295905f1 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_textarea.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_textarea.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_textfield.qml b/tests/auto/quickcontrols/controls/data/tst_textfield.qml
index f5b3d91fe1..f5b3d91fe1 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_textfield.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_textfield.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_toolbar.qml b/tests/auto/quickcontrols/controls/data/tst_toolbar.qml
index d2c9e4a20d..d2c9e4a20d 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_toolbar.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_toolbar.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_toolbutton.qml b/tests/auto/quickcontrols/controls/data/tst_toolbutton.qml
index 4879e91611..4879e91611 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_toolbutton.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_toolbutton.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_toolseparator.qml b/tests/auto/quickcontrols/controls/data/tst_toolseparator.qml
index ef7fc35758..ef7fc35758 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_toolseparator.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_toolseparator.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_tooltip.qml b/tests/auto/quickcontrols/controls/data/tst_tooltip.qml
index 1aa63e56a2..1aa63e56a2 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_tooltip.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_tooltip.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_tumbler.qml b/tests/auto/quickcontrols/controls/data/tst_tumbler.qml
index bb098f92db..bb098f92db 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_tumbler.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_tumbler.qml
diff --git a/tests/auto/quickcontrols2/controls/data/tst_weeknumbercolumn.qml b/tests/auto/quickcontrols/controls/data/tst_weeknumbercolumn.qml
index 40566b018c..40566b018c 100644
--- a/tests/auto/quickcontrols2/controls/data/tst_weeknumbercolumn.qml
+++ b/tests/auto/quickcontrols/controls/data/tst_weeknumbercolumn.qml
diff --git a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST b/tests/auto/quickcontrols/controls/fusion/BLACKLIST
index b643dd1d9c..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/fusion/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/fusion/CMakeLists.txt b/tests/auto/quickcontrols/controls/fusion/CMakeLists.txt
index 932d3b8be6..932d3b8be6 100644
--- a/tests/auto/quickcontrols2/controls/fusion/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/fusion/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/fusion/dependencies.qml b/tests/auto/quickcontrols/controls/fusion/dependencies.qml
index f2e40e6059..f2e40e6059 100644
--- a/tests/auto/quickcontrols2/controls/fusion/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/fusion/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/fusion/dummy_imports.qml b/tests/auto/quickcontrols/controls/fusion/dummy_imports.qml
index 66e184f138..66e184f138 100644
--- a/tests/auto/quickcontrols2/controls/fusion/dummy_imports.qml
+++ b/tests/auto/quickcontrols/controls/fusion/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/controls/fusion/tst_fusion.cpp b/tests/auto/quickcontrols/controls/fusion/tst_fusion.cpp
index b7aa9aa434..b7aa9aa434 100644
--- a/tests/auto/quickcontrols2/controls/fusion/tst_fusion.cpp
+++ b/tests/auto/quickcontrols/controls/fusion/tst_fusion.cpp
diff --git a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST b/tests/auto/quickcontrols/controls/imagine/BLACKLIST
index c3865e0006..c3865e0006 100644
--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/imagine/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/imagine/CMakeLists.txt b/tests/auto/quickcontrols/controls/imagine/CMakeLists.txt
index a94fbb7681..a94fbb7681 100644
--- a/tests/auto/quickcontrols2/controls/imagine/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/imagine/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/imagine/dependencies.qml b/tests/auto/quickcontrols/controls/imagine/dependencies.qml
index 9a31141bff..9a31141bff 100644
--- a/tests/auto/quickcontrols2/controls/imagine/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/imagine/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/imagine/dummy_imports.qml b/tests/auto/quickcontrols/controls/imagine/dummy_imports.qml
index 66e184f138..66e184f138 100644
--- a/tests/auto/quickcontrols2/controls/imagine/dummy_imports.qml
+++ b/tests/auto/quickcontrols/controls/imagine/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/controls/imagine/tst_imagine.cpp b/tests/auto/quickcontrols/controls/imagine/tst_imagine.cpp
index 1a46d26c1c..1a46d26c1c 100644
--- a/tests/auto/quickcontrols2/controls/imagine/tst_imagine.cpp
+++ b/tests/auto/quickcontrols/controls/imagine/tst_imagine.cpp
diff --git a/tests/auto/quickcontrols2/controls/ios/BLACKLIST b/tests/auto/quickcontrols/controls/ios/BLACKLIST
index e5d8e9bcab..e5d8e9bcab 100644
--- a/tests/auto/quickcontrols2/controls/ios/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/ios/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/ios/CMakeLists.txt b/tests/auto/quickcontrols/controls/ios/CMakeLists.txt
index f4c0c7c4cd..f4c0c7c4cd 100644
--- a/tests/auto/quickcontrols2/controls/ios/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/ios/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/ios/tst_ios.cpp b/tests/auto/quickcontrols/controls/ios/tst_ios.cpp
index 954b964958..954b964958 100644
--- a/tests/auto/quickcontrols2/controls/ios/tst_ios.cpp
+++ b/tests/auto/quickcontrols/controls/ios/tst_ios.cpp
diff --git a/tests/auto/quickcontrols2/controls/macos/BLACKLIST b/tests/auto/quickcontrols/controls/macos/BLACKLIST
index 1e751af957..1e751af957 100644
--- a/tests/auto/quickcontrols2/controls/macos/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/macos/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/macos/CMakeLists.txt b/tests/auto/quickcontrols/controls/macos/CMakeLists.txt
index f3d71065e7..f3d71065e7 100644
--- a/tests/auto/quickcontrols2/controls/macos/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/macos/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/macos/tst_macos.cpp b/tests/auto/quickcontrols/controls/macos/tst_macos.cpp
index 2a8c612ca7..2a8c612ca7 100644
--- a/tests/auto/quickcontrols2/controls/macos/tst_macos.cpp
+++ b/tests/auto/quickcontrols/controls/macos/tst_macos.cpp
diff --git a/tests/auto/quickcontrols2/controls/material/BLACKLIST b/tests/auto/quickcontrols/controls/material/BLACKLIST
index b643dd1d9c..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/material/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/material/CMakeLists.txt b/tests/auto/quickcontrols/controls/material/CMakeLists.txt
index 5b7836e769..5b7836e769 100644
--- a/tests/auto/quickcontrols2/controls/material/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/material/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/material/dependencies.qml b/tests/auto/quickcontrols/controls/material/dependencies.qml
index 8bcf03013c..8bcf03013c 100644
--- a/tests/auto/quickcontrols2/controls/material/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/material/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/material/dummy_imports.qml b/tests/auto/quickcontrols/controls/material/dummy_imports.qml
index 66e184f138..66e184f138 100644
--- a/tests/auto/quickcontrols2/controls/material/dummy_imports.qml
+++ b/tests/auto/quickcontrols/controls/material/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/controls/material/tst_material.cpp b/tests/auto/quickcontrols/controls/material/tst_material.cpp
index 1fa55ab4dc..1fa55ab4dc 100644
--- a/tests/auto/quickcontrols2/controls/material/tst_material.cpp
+++ b/tests/auto/quickcontrols/controls/material/tst_material.cpp
diff --git a/tests/auto/quickcontrols2/controls/universal/BLACKLIST b/tests/auto/quickcontrols/controls/universal/BLACKLIST
index b643dd1d9c..b643dd1d9c 100644
--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/universal/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/universal/CMakeLists.txt b/tests/auto/quickcontrols/controls/universal/CMakeLists.txt
index 3d7109dad8..3d7109dad8 100644
--- a/tests/auto/quickcontrols2/controls/universal/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/universal/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/universal/dependencies.qml b/tests/auto/quickcontrols/controls/universal/dependencies.qml
index 8ba71c8302..8ba71c8302 100644
--- a/tests/auto/quickcontrols2/controls/universal/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/universal/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/universal/dummy_imports.qml b/tests/auto/quickcontrols/controls/universal/dummy_imports.qml
index 66e184f138..66e184f138 100644
--- a/tests/auto/quickcontrols2/controls/universal/dummy_imports.qml
+++ b/tests/auto/quickcontrols/controls/universal/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/controls/universal/tst_universal.cpp b/tests/auto/quickcontrols/controls/universal/tst_universal.cpp
index 87faccc5ff..87faccc5ff 100644
--- a/tests/auto/quickcontrols2/controls/universal/tst_universal.cpp
+++ b/tests/auto/quickcontrols/controls/universal/tst_universal.cpp
diff --git a/tests/auto/quickcontrols2/controls/windows/BLACKLIST b/tests/auto/quickcontrols/controls/windows/BLACKLIST
index 8230d5eb4e..8230d5eb4e 100644
--- a/tests/auto/quickcontrols2/controls/windows/BLACKLIST
+++ b/tests/auto/quickcontrols/controls/windows/BLACKLIST
diff --git a/tests/auto/quickcontrols2/controls/windows/CMakeLists.txt b/tests/auto/quickcontrols/controls/windows/CMakeLists.txt
index e351842045..e351842045 100644
--- a/tests/auto/quickcontrols2/controls/windows/CMakeLists.txt
+++ b/tests/auto/quickcontrols/controls/windows/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/controls/windows/dependencies.qml b/tests/auto/quickcontrols/controls/windows/dependencies.qml
index f7d87422b5..f7d87422b5 100644
--- a/tests/auto/quickcontrols2/controls/windows/dependencies.qml
+++ b/tests/auto/quickcontrols/controls/windows/dependencies.qml
diff --git a/tests/auto/quickcontrols2/controls/windows/tst_windows.cpp b/tests/auto/quickcontrols/controls/windows/tst_windows.cpp
index 59c57b5410..59c57b5410 100644
--- a/tests/auto/quickcontrols2/controls/windows/tst_windows.cpp
+++ b/tests/auto/quickcontrols/controls/windows/tst_windows.cpp
diff --git a/tests/auto/quickcontrols2/cursor/BLACKLIST b/tests/auto/quickcontrols/cursor/BLACKLIST
index cebb2c9438..cebb2c9438 100644
--- a/tests/auto/quickcontrols2/cursor/BLACKLIST
+++ b/tests/auto/quickcontrols/cursor/BLACKLIST
diff --git a/tests/auto/quickcontrols2/cursor/CMakeLists.txt b/tests/auto/quickcontrols/cursor/CMakeLists.txt
index 84af3e6cdb..1033b2c12a 100644
--- a/tests/auto/quickcontrols2/cursor/CMakeLists.txt
+++ b/tests/auto/quickcontrols/cursor/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_cursor
     SOURCES
         tst_cursor.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/cursor/data/buttons.qml b/tests/auto/quickcontrols/cursor/data/buttons.qml
index b2a3cccc34..b2a3cccc34 100644
--- a/tests/auto/quickcontrols2/cursor/data/buttons.qml
+++ b/tests/auto/quickcontrols/cursor/data/buttons.qml
diff --git a/tests/auto/quickcontrols2/cursor/data/containers.qml b/tests/auto/quickcontrols/cursor/data/containers.qml
index 420a1a592d..420a1a592d 100644
--- a/tests/auto/quickcontrols2/cursor/data/containers.qml
+++ b/tests/auto/quickcontrols/cursor/data/containers.qml
diff --git a/tests/auto/quickcontrols2/cursor/data/editable.qml b/tests/auto/quickcontrols/cursor/data/editable.qml
index 1750c481b9..1750c481b9 100644
--- a/tests/auto/quickcontrols2/cursor/data/editable.qml
+++ b/tests/auto/quickcontrols/cursor/data/editable.qml
diff --git a/tests/auto/quickcontrols2/cursor/data/pageindicator.qml b/tests/auto/quickcontrols/cursor/data/pageindicator.qml
index 3f9178a50d..3f9178a50d 100644
--- a/tests/auto/quickcontrols2/cursor/data/pageindicator.qml
+++ b/tests/auto/quickcontrols/cursor/data/pageindicator.qml
diff --git a/tests/auto/quickcontrols2/cursor/data/scrollbar.qml b/tests/auto/quickcontrols/cursor/data/scrollbar.qml
index 1269cc9c6b..1269cc9c6b 100644
--- a/tests/auto/quickcontrols2/cursor/data/scrollbar.qml
+++ b/tests/auto/quickcontrols/cursor/data/scrollbar.qml
diff --git a/tests/auto/quickcontrols2/cursor/data/sliders.qml b/tests/auto/quickcontrols/cursor/data/sliders.qml
index ae2f8a962d..ae2f8a962d 100644
--- a/tests/auto/quickcontrols2/cursor/data/sliders.qml
+++ b/tests/auto/quickcontrols/cursor/data/sliders.qml
diff --git a/tests/auto/quickcontrols2/cursor/tst_cursor.cpp b/tests/auto/quickcontrols/cursor/tst_cursor.cpp
index 02a25848dc..02a25848dc 100644
--- a/tests/auto/quickcontrols2/cursor/tst_cursor.cpp
+++ b/tests/auto/quickcontrols/cursor/tst_cursor.cpp
diff --git a/tests/auto/quickcontrols2/customization/CMakeLists.txt b/tests/auto/quickcontrols/customization/CMakeLists.txt
index cd7359f305..5e2acab350 100644
--- a/tests/auto/quickcontrols2/customization/CMakeLists.txt
+++ b/tests/auto/quickcontrols/customization/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_customization
     SOURCES
         tst_customization.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/AbstractButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/AbstractButton.qml
index 82e9e4bd4a..82e9e4bd4a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/AbstractButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/AbstractButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ApplicationWindow.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ApplicationWindow.qml
index 92067837d3..92067837d3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ApplicationWindow.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/BusyIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/empty/BusyIndicator.qml
index 2364737a9d..2364737a9d 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/BusyIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/BusyIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Button.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Button.qml
index 7f14f150c1..7f14f150c1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Button.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Button.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/CheckBox.qml b/tests/auto/quickcontrols/customization/data/styles/empty/CheckBox.qml
index 29b63ab1d4..29b63ab1d4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/CheckBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/CheckBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/CheckDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/empty/CheckDelegate.qml
index 0760efad05..0760efad05 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/CheckDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/CheckDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ComboBox.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ComboBox.qml
index 4bb5b6538e..4bb5b6538e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ComboBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ComboBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Container.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Container.qml
index bcf0a906ac..bcf0a906ac 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Container.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Container.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Control.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Control.qml
index 0a1db09a82..0a1db09a82 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Control.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Control.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/DelayButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/DelayButton.qml
index 849a82f9f7..849a82f9f7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/DelayButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/DelayButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Dial.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Dial.qml
index b4d062c47b..b4d062c47b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Dial.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Dial.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Dialog.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Dialog.qml
index b43550817a..b43550817a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Dialog.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Dialog.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/DialogButtonBox.qml b/tests/auto/quickcontrols/customization/data/styles/empty/DialogButtonBox.qml
index 14c4982d8c..14c4982d8c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/DialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Drawer.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Drawer.qml
index eee198aa10..eee198aa10 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Drawer.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Drawer.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Frame.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Frame.qml
index cb7dc659e8..cb7dc659e8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Frame.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Frame.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/GroupBox.qml b/tests/auto/quickcontrols/customization/data/styles/empty/GroupBox.qml
index 42a26c114d..42a26c114d 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/GroupBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/GroupBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ItemDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ItemDelegate.qml
index ff7cc8dac8..ff7cc8dac8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ItemDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ItemDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Label.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Label.qml
index a70541c788..a70541c788 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Label.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Label.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Menu.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Menu.qml
index 7f03fd0193..7f03fd0193 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Menu.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Menu.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBar.qml b/tests/auto/quickcontrols/customization/data/styles/empty/MenuBar.qml
index 742492a467..742492a467 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/MenuBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBarItem.qml b/tests/auto/quickcontrols/customization/data/styles/empty/MenuBarItem.qml
index b17f33bedc..b17f33bedc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuBarItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/MenuBarItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuItem.qml b/tests/auto/quickcontrols/customization/data/styles/empty/MenuItem.qml
index c0639e3dc2..c0639e3dc2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/MenuItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/empty/MenuSeparator.qml
index f470175d9e..f470175d9e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/MenuSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/MenuSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Page.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Page.qml
index 39631703f7..39631703f7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Page.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Page.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/PageIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/empty/PageIndicator.qml
index fa47a9e8e1..fa47a9e8e1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/PageIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/PageIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Pane.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Pane.qml
index 090ca74ef0..090ca74ef0 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Pane.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Pane.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Popup.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Popup.qml
index 3fac8c15dd..3fac8c15dd 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Popup.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Popup.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ProgressBar.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ProgressBar.qml
index 19701a3566..19701a3566 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ProgressBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ProgressBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/RadioButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/RadioButton.qml
index e39736a523..e39736a523 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/RadioButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/RadioButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/RadioDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/empty/RadioDelegate.qml
index 1f4aa70f04..1f4aa70f04 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/RadioDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/RadioDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/RangeSlider.qml b/tests/auto/quickcontrols/customization/data/styles/empty/RangeSlider.qml
index 26f410b4b7..26f410b4b7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/RangeSlider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/RangeSlider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/RoundButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/RoundButton.qml
index adaaddc6e4..adaaddc6e4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/RoundButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/RoundButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollBar.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollBar.qml
index f10d4c9ce7..f10d4c9ce7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollIndicator.qml
index 211178f39a..211178f39a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollView.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollView.qml
index b80618674b..b80618674b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ScrollView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ScrollView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Slider.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Slider.qml
index 098b615ffa..098b615ffa 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Slider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Slider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/SpinBox.qml b/tests/auto/quickcontrols/customization/data/styles/empty/SpinBox.qml
index f7ef626944..f7ef626944 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/SpinBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/SpinBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/StackView.qml b/tests/auto/quickcontrols/customization/data/styles/empty/StackView.qml
index 5dc2edc34c..5dc2edc34c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/StackView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/StackView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/empty/SwipeDelegate.qml
index f802533d97..f802533d97 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/SwipeDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeView.qml b/tests/auto/quickcontrols/customization/data/styles/empty/SwipeView.qml
index b4b6d3be6c..b4b6d3be6c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/SwipeView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/SwipeView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Switch.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Switch.qml
index ace8f83321..ace8f83321 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Switch.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Switch.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/SwitchDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/empty/SwitchDelegate.qml
index c516e8b178..c516e8b178 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/SwitchDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/TabBar.qml b/tests/auto/quickcontrols/customization/data/styles/empty/TabBar.qml
index 3f71b3a0ec..3f71b3a0ec 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/TabBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/TabBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/TabButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/TabButton.qml
index 1bf2625589..1bf2625589 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/TabButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/TabButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/TextArea.qml b/tests/auto/quickcontrols/customization/data/styles/empty/TextArea.qml
index 01807d1606..01807d1606 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/TextArea.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/TextArea.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/TextField.qml b/tests/auto/quickcontrols/customization/data/styles/empty/TextField.qml
index 6001e445a1..6001e445a1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/TextField.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/TextField.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolBar.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ToolBar.qml
index b8dd897b6e..b8dd897b6e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ToolBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolButton.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ToolButton.qml
index c6d9c4df5b..c6d9c4df5b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ToolButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ToolSeparator.qml
index a9a26e562e..a9a26e562e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ToolSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolTip.qml b/tests/auto/quickcontrols/customization/data/styles/empty/ToolTip.qml
index 73ccddb576..73ccddb576 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/ToolTip.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/ToolTip.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/Tumbler.qml b/tests/auto/quickcontrols/customization/data/styles/empty/Tumbler.qml
index 11c3b0b552..11c3b0b552 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/Tumbler.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/Tumbler.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/empty/qmldir b/tests/auto/quickcontrols/customization/data/styles/empty/qmldir
index a5fcc4c7e5..a5fcc4c7e5 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/empty/qmldir
+++ b/tests/auto/quickcontrols/customization/data/styles/empty/qmldir
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/AbstractButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/AbstractButton.qml
index 2db395fe7a..2db395fe7a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/AbstractButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/AbstractButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ApplicationWindow.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ApplicationWindow.qml
index 846cc0fd00..846cc0fd00 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ApplicationWindow.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/BusyIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/identified/BusyIndicator.qml
index 177685b980..177685b980 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/BusyIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/BusyIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Button.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Button.qml
index 2fea6704dc..2fea6704dc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Button.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Button.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/CheckBox.qml b/tests/auto/quickcontrols/customization/data/styles/identified/CheckBox.qml
index 3813aeeb7a..3813aeeb7a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/CheckBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/CheckBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/CheckDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/identified/CheckDelegate.qml
index f78b3f7984..f78b3f7984 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/CheckDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/CheckDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ComboBox.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ComboBox.qml
index 0945e49bb4..0945e49bb4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ComboBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ComboBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Container.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Container.qml
index 941b9b7467..941b9b7467 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Container.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Container.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Control.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Control.qml
index f2f3928c8a..f2f3928c8a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Control.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Control.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/DelayButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/DelayButton.qml
index 18119a8aa6..18119a8aa6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/DelayButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/DelayButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Dial.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Dial.qml
index 84dea2aa70..84dea2aa70 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Dial.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Dial.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Dialog.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Dialog.qml
index 4beace01e7..4beace01e7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Dialog.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Dialog.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/DialogButtonBox.qml b/tests/auto/quickcontrols/customization/data/styles/identified/DialogButtonBox.qml
index 0cec0f5a6c..0cec0f5a6c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/DialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Drawer.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Drawer.qml
index d8634410cd..d8634410cd 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Drawer.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Drawer.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Frame.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Frame.qml
index 014b2a74b3..014b2a74b3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Frame.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Frame.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/GroupBox.qml b/tests/auto/quickcontrols/customization/data/styles/identified/GroupBox.qml
index 767259242c..767259242c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/GroupBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/GroupBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ItemDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ItemDelegate.qml
index c7d4002407..c7d4002407 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ItemDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ItemDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Label.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Label.qml
index c9b00ff1ca..c9b00ff1ca 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Label.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Label.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Menu.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Menu.qml
index 822824dca8..822824dca8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Menu.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Menu.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBar.qml b/tests/auto/quickcontrols/customization/data/styles/identified/MenuBar.qml
index 94b5997165..94b5997165 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/MenuBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBarItem.qml b/tests/auto/quickcontrols/customization/data/styles/identified/MenuBarItem.qml
index da6c584ebc..da6c584ebc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuBarItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/MenuBarItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuItem.qml b/tests/auto/quickcontrols/customization/data/styles/identified/MenuItem.qml
index 4ba04908ad..4ba04908ad 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/MenuItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/identified/MenuSeparator.qml
index 6928eb01bc..6928eb01bc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/MenuSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/MenuSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Page.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Page.qml
index d63e4ce80d..d63e4ce80d 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Page.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Page.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/PageIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/identified/PageIndicator.qml
index c47cb69e9e..c47cb69e9e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/PageIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/PageIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Pane.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Pane.qml
index c5739700d3..c5739700d3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Pane.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Pane.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Popup.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Popup.qml
index e71be2f3de..e71be2f3de 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Popup.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Popup.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ProgressBar.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ProgressBar.qml
index d1cfd16419..d1cfd16419 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ProgressBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ProgressBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/RadioButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/RadioButton.qml
index ce64bdee5a..ce64bdee5a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/RadioButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/RadioButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/RadioDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/identified/RadioDelegate.qml
index eeba29faa7..eeba29faa7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/RadioDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/RadioDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/RangeSlider.qml b/tests/auto/quickcontrols/customization/data/styles/identified/RangeSlider.qml
index 1fae11c2fa..1fae11c2fa 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/RangeSlider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/RangeSlider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/RoundButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/RoundButton.qml
index b431a3a02c..b431a3a02c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/RoundButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/RoundButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollBar.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollBar.qml
index 4bb5da5a18..4bb5da5a18 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollIndicator.qml
index a62b36afa2..a62b36afa2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollView.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollView.qml
index 94cb1bc1a5..94cb1bc1a5 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ScrollView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ScrollView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Slider.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Slider.qml
index 5298a1556e..5298a1556e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Slider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Slider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/SpinBox.qml b/tests/auto/quickcontrols/customization/data/styles/identified/SpinBox.qml
index 2e285b0f47..2e285b0f47 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/SpinBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/SpinBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/StackView.qml b/tests/auto/quickcontrols/customization/data/styles/identified/StackView.qml
index 5c5cd31af4..5c5cd31af4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/StackView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/StackView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/identified/SwipeDelegate.qml
index 403b7d5a82..403b7d5a82 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/SwipeDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeView.qml b/tests/auto/quickcontrols/customization/data/styles/identified/SwipeView.qml
index 8c8345a524..8c8345a524 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/SwipeView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/SwipeView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Switch.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Switch.qml
index 9fc0c0f010..9fc0c0f010 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Switch.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Switch.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/SwitchDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/identified/SwitchDelegate.qml
index 3f7f9568fb..3f7f9568fb 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/SwitchDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/TabBar.qml b/tests/auto/quickcontrols/customization/data/styles/identified/TabBar.qml
index 50e36498b7..50e36498b7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/TabBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/TabBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/TabButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/TabButton.qml
index 19145e14fd..19145e14fd 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/TabButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/TabButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/TextArea.qml b/tests/auto/quickcontrols/customization/data/styles/identified/TextArea.qml
index a7d4e212f0..a7d4e212f0 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/TextArea.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/TextArea.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/TextField.qml b/tests/auto/quickcontrols/customization/data/styles/identified/TextField.qml
index 3d78c4b73c..3d78c4b73c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/TextField.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/TextField.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolBar.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ToolBar.qml
index b328828267..b328828267 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ToolBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolButton.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ToolButton.qml
index 465de9a6f1..465de9a6f1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ToolButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ToolSeparator.qml
index 81c8f40178..81c8f40178 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ToolSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolTip.qml b/tests/auto/quickcontrols/customization/data/styles/identified/ToolTip.qml
index 2d8533dd0a..2d8533dd0a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/ToolTip.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/ToolTip.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/Tumbler.qml b/tests/auto/quickcontrols/customization/data/styles/identified/Tumbler.qml
index 67d4cd9b64..67d4cd9b64 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/Tumbler.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/Tumbler.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/identified/qmldir b/tests/auto/quickcontrols/customization/data/styles/identified/qmldir
index 1ee2a92e11..1ee2a92e11 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/identified/qmldir
+++ b/tests/auto/quickcontrols/customization/data/styles/identified/qmldir
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/AbstractButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/AbstractButton.qml
index b29c8fa15e..b29c8fa15e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/AbstractButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/AbstractButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ApplicationWindow.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ApplicationWindow.qml
index 437410b72d..437410b72d 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ApplicationWindow.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/BusyIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/BusyIndicator.qml
index 6c1ed812b7..6c1ed812b7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/BusyIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/BusyIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Button.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Button.qml
index d0bfc4c563..d0bfc4c563 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Button.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Button.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckBox.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/CheckBox.qml
index 34d01e4e70..34d01e4e70 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/CheckBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/CheckDelegate.qml
index e17820ac4e..e17820ac4e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/CheckDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/CheckDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ComboBox.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ComboBox.qml
index 611358a381..611358a381 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ComboBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ComboBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Container.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Container.qml
index d6276f222e..d6276f222e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Container.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Container.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Control.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Control.qml
index bb924ce15c..bb924ce15c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Control.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Control.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/DelayButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/DelayButton.qml
index 60a1d67e62..60a1d67e62 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/DelayButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/DelayButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dial.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Dial.qml
index a16ad247ac..a16ad247ac 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dial.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Dial.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dialog.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Dialog.qml
index 2cd9bb9b20..2cd9bb9b20 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Dialog.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Dialog.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/DialogButtonBox.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/DialogButtonBox.qml
index 23eea3c0df..23eea3c0df 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/DialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Drawer.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Drawer.qml
index 0fbc879fb2..0fbc879fb2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Drawer.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Drawer.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Frame.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Frame.qml
index c84280cb21..c84280cb21 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Frame.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Frame.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/GroupBox.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/GroupBox.qml
index 518a836e92..518a836e92 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/GroupBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/GroupBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ItemDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ItemDelegate.qml
index 7150c79aa4..7150c79aa4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ItemDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ItemDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Label.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Label.qml
index 662e22eac5..662e22eac5 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Label.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Label.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Menu.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Menu.qml
index 173c50f7e8..173c50f7e8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Menu.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Menu.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBar.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuBar.qml
index 680caa9ada..680caa9ada 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBarItem.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuBarItem.qml
index b3cdc391b9..b3cdc391b9 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuBarItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuBarItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuItem.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuItem.qml
index 1f277bc466..1f277bc466 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuSeparator.qml
index e9ad13b303..e9ad13b303 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/MenuSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/MenuSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Page.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Page.qml
index 0ddf3f5b51..0ddf3f5b51 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Page.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Page.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/PageIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/PageIndicator.qml
index bc4c22f093..bc4c22f093 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/PageIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/PageIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Pane.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Pane.qml
index 816dcf5669..816dcf5669 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Pane.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Pane.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Popup.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Popup.qml
index 55dac84936..55dac84936 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Popup.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Popup.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ProgressBar.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ProgressBar.qml
index 9ce1cd99f3..9ce1cd99f3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ProgressBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ProgressBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/RadioButton.qml
index e76b465c69..e76b465c69 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/RadioButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/RadioDelegate.qml
index 4514f466c8..4514f466c8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RadioDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/RadioDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RangeSlider.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/RangeSlider.qml
index d747ce8bc2..d747ce8bc2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RangeSlider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/RangeSlider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RoundButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/RoundButton.qml
index 5152ed430f..5152ed430f 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/RoundButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/RoundButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollBar.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollBar.qml
index 55e74e088b..55e74e088b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollIndicator.qml
index 9bf0a176e1..9bf0a176e1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollView.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollView.qml
index 1029e4ed20..1029e4ed20 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ScrollView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ScrollView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Slider.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Slider.qml
index 52038ea8ed..52038ea8ed 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Slider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Slider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SpinBox.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/SpinBox.qml
index 388e82e51b..388e82e51b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SpinBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/SpinBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/StackView.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/StackView.qml
index 2664fea8d7..2664fea8d7 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/StackView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/StackView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwipeDelegate.qml
index 71df762fe8..71df762fe8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwipeDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeView.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwipeView.qml
index b0801f7a74..b0801f7a74 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwipeView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwipeView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Switch.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Switch.qml
index f413f5b310..f413f5b310 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Switch.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Switch.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwitchDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwitchDelegate.qml
index 9342280478..9342280478 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/SwitchDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabBar.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/TabBar.qml
index ec59e9eedc..ec59e9eedc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/TabBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/TabButton.qml
index 9a3eda7aa9..9a3eda7aa9 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TabButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/TabButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextArea.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/TextArea.qml
index fe03103e9f..fe03103e9f 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextArea.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/TextArea.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextField.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/TextField.qml
index ff2e08e82e..ff2e08e82e 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/TextField.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/TextField.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolBar.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolBar.qml
index 73e8d45187..73e8d45187 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolButton.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolButton.qml
index f45e98f851..f45e98f851 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolSeparator.qml
index 840bd16711..840bd16711 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolTip.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolTip.qml
index 9d6e77cb60..9d6e77cb60 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/ToolTip.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/ToolTip.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Tumbler.qml b/tests/auto/quickcontrols/customization/data/styles/incomplete/Tumbler.qml
index dba21f56d1..dba21f56d1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/Tumbler.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/Tumbler.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/incomplete/qmldir b/tests/auto/quickcontrols/customization/data/styles/incomplete/qmldir
index e8813bd518..e8813bd518 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/incomplete/qmldir
+++ b/tests/auto/quickcontrols/customization/data/styles/incomplete/qmldir
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/AbstractButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/AbstractButton.qml
index ba1b1cb8fa..ba1b1cb8fa 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/AbstractButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/AbstractButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ApplicationWindow.qml b/tests/auto/quickcontrols/customization/data/styles/override/ApplicationWindow.qml
index d2439bfb84..d2439bfb84 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ApplicationWindow.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/BusyIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/override/BusyIndicator.qml
index 827b45810a..827b45810a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/BusyIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/BusyIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Button.qml b/tests/auto/quickcontrols/customization/data/styles/override/Button.qml
index a5bea3ebfe..a5bea3ebfe 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Button.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Button.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/CheckBox.qml b/tests/auto/quickcontrols/customization/data/styles/override/CheckBox.qml
index aa7230cbd9..aa7230cbd9 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/CheckBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/CheckBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/CheckDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/override/CheckDelegate.qml
index ea0b768bb4..ea0b768bb4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/CheckDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/CheckDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ComboBox.qml b/tests/auto/quickcontrols/customization/data/styles/override/ComboBox.qml
index ba2467e0be..ba2467e0be 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ComboBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ComboBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Container.qml b/tests/auto/quickcontrols/customization/data/styles/override/Container.qml
index 68186cd2e0..68186cd2e0 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Container.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Container.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Control.qml b/tests/auto/quickcontrols/customization/data/styles/override/Control.qml
index b9ca4c2643..b9ca4c2643 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Control.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Control.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/DelayButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/DelayButton.qml
index 68ff2684d3..68ff2684d3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/DelayButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/DelayButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Dial.qml b/tests/auto/quickcontrols/customization/data/styles/override/Dial.qml
index e451b6b0c2..e451b6b0c2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Dial.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Dial.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Dialog.qml b/tests/auto/quickcontrols/customization/data/styles/override/Dialog.qml
index 1870887243..1870887243 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Dialog.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Dialog.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/DialogButtonBox.qml b/tests/auto/quickcontrols/customization/data/styles/override/DialogButtonBox.qml
index 4e7ceb0ab6..4e7ceb0ab6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/DialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Drawer.qml b/tests/auto/quickcontrols/customization/data/styles/override/Drawer.qml
index 0de7097601..0de7097601 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Drawer.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Drawer.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Frame.qml b/tests/auto/quickcontrols/customization/data/styles/override/Frame.qml
index 3e4effff0a..3e4effff0a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Frame.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Frame.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/GroupBox.qml b/tests/auto/quickcontrols/customization/data/styles/override/GroupBox.qml
index a50e3a519b..a50e3a519b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/GroupBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/GroupBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ItemDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/override/ItemDelegate.qml
index 4e4f8d0fdd..4e4f8d0fdd 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ItemDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ItemDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Label.qml b/tests/auto/quickcontrols/customization/data/styles/override/Label.qml
index 22ea5aab7c..22ea5aab7c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Label.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Label.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Menu.qml b/tests/auto/quickcontrols/customization/data/styles/override/Menu.qml
index 88d8510675..88d8510675 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Menu.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Menu.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/MenuBar.qml b/tests/auto/quickcontrols/customization/data/styles/override/MenuBar.qml
index 90aa93ca19..90aa93ca19 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/MenuBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/MenuBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/MenuBarItem.qml b/tests/auto/quickcontrols/customization/data/styles/override/MenuBarItem.qml
index 18db0060a1..18db0060a1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/MenuBarItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/MenuBarItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/MenuItem.qml b/tests/auto/quickcontrols/customization/data/styles/override/MenuItem.qml
index 43acebc514..43acebc514 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/MenuItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/MenuItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/MenuSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/override/MenuSeparator.qml
index 703e381698..703e381698 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/MenuSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/MenuSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Page.qml b/tests/auto/quickcontrols/customization/data/styles/override/Page.qml
index 2fa1ad4d44..2fa1ad4d44 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Page.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Page.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/PageIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/override/PageIndicator.qml
index 4e4cef6d90..4e4cef6d90 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/PageIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/PageIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Pane.qml b/tests/auto/quickcontrols/customization/data/styles/override/Pane.qml
index 8a281da2b0..8a281da2b0 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Pane.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Pane.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Popup.qml b/tests/auto/quickcontrols/customization/data/styles/override/Popup.qml
index 6dfa3b20e4..6dfa3b20e4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Popup.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Popup.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ProgressBar.qml b/tests/auto/quickcontrols/customization/data/styles/override/ProgressBar.qml
index e111790fe3..e111790fe3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ProgressBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ProgressBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/RadioButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/RadioButton.qml
index b7a3a0a10d..b7a3a0a10d 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/RadioButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/RadioButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/RadioDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/override/RadioDelegate.qml
index 83c0d73551..83c0d73551 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/RadioDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/RadioDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/RangeSlider.qml b/tests/auto/quickcontrols/customization/data/styles/override/RangeSlider.qml
index 3025960649..3025960649 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/RangeSlider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/RangeSlider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/RoundButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/RoundButton.qml
index 3949749ed2..3949749ed2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/RoundButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/RoundButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollBar.qml b/tests/auto/quickcontrols/customization/data/styles/override/ScrollBar.qml
index a546bf2eec..a546bf2eec 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ScrollBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/override/ScrollIndicator.qml
index f514210c1a..f514210c1a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ScrollIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollView.qml b/tests/auto/quickcontrols/customization/data/styles/override/ScrollView.qml
index ae6da7860b..ae6da7860b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ScrollView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ScrollView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Slider.qml b/tests/auto/quickcontrols/customization/data/styles/override/Slider.qml
index 5ced07590a..5ced07590a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Slider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Slider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/SpinBox.qml b/tests/auto/quickcontrols/customization/data/styles/override/SpinBox.qml
index 66c13d3cf8..66c13d3cf8 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/SpinBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/SpinBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/StackView.qml b/tests/auto/quickcontrols/customization/data/styles/override/StackView.qml
index 8759551ae1..8759551ae1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/StackView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/StackView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/SwipeDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/override/SwipeDelegate.qml
index ae994c612c..ae994c612c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/SwipeDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/SwipeView.qml b/tests/auto/quickcontrols/customization/data/styles/override/SwipeView.qml
index d0b584bfd4..d0b584bfd4 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/SwipeView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/SwipeView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Switch.qml b/tests/auto/quickcontrols/customization/data/styles/override/Switch.qml
index 83e5f2b56b..83e5f2b56b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Switch.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Switch.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/SwitchDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/override/SwitchDelegate.qml
index 5e75fdbd64..5e75fdbd64 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/SwitchDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/TabBar.qml b/tests/auto/quickcontrols/customization/data/styles/override/TabBar.qml
index 0437d3b5af..0437d3b5af 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/TabBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/TabBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/TabButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/TabButton.qml
index ab78b3246f..ab78b3246f 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/TabButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/TabButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/TextArea.qml b/tests/auto/quickcontrols/customization/data/styles/override/TextArea.qml
index 17d1883624..17d1883624 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/TextArea.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/TextArea.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/TextField.qml b/tests/auto/quickcontrols/customization/data/styles/override/TextField.qml
index 22c21fd751..22c21fd751 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/TextField.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/TextField.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ToolBar.qml b/tests/auto/quickcontrols/customization/data/styles/override/ToolBar.qml
index 957f3f7b5b..957f3f7b5b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ToolBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ToolBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ToolButton.qml b/tests/auto/quickcontrols/customization/data/styles/override/ToolButton.qml
index 19999c8a4a..19999c8a4a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ToolButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ToolButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ToolSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/override/ToolSeparator.qml
index b88fba1bab..b88fba1bab 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ToolSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ToolSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/ToolTip.qml b/tests/auto/quickcontrols/customization/data/styles/override/ToolTip.qml
index b4922d05eb..b4922d05eb 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/ToolTip.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/ToolTip.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/Tumbler.qml b/tests/auto/quickcontrols/customization/data/styles/override/Tumbler.qml
index ac49cd7675..ac49cd7675 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/Tumbler.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/override/Tumbler.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/override/qmldir b/tests/auto/quickcontrols/customization/data/styles/override/qmldir
index f15ba96ab3..f15ba96ab3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/override/qmldir
+++ b/tests/auto/quickcontrols/customization/data/styles/override/qmldir
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/AbstractButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/AbstractButton.qml
index f0d9935706..f0d9935706 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/AbstractButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/AbstractButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ApplicationWindow.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ApplicationWindow.qml
index 8f3f02a05a..8f3f02a05a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ApplicationWindow.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ApplicationWindow.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/BusyIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/simple/BusyIndicator.qml
index d5520d2ba6..d5520d2ba6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/BusyIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/BusyIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Button.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Button.qml
index b71c5e3af9..b71c5e3af9 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Button.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Button.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/CheckBox.qml b/tests/auto/quickcontrols/customization/data/styles/simple/CheckBox.qml
index aef812111a..aef812111a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/CheckBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/CheckBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/CheckDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/simple/CheckDelegate.qml
index 06d5ac9cb0..06d5ac9cb0 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/CheckDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/CheckDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ComboBox.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ComboBox.qml
index c5519f1c2a..c5519f1c2a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ComboBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ComboBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Container.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Container.qml
index 85c59b4053..85c59b4053 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Container.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Container.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Control.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Control.qml
index 7e4808101b..7e4808101b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Control.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Control.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/DelayButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/DelayButton.qml
index db6dd16514..db6dd16514 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/DelayButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/DelayButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Dial.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Dial.qml
index 6365f50387..6365f50387 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Dial.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Dial.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Dialog.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Dialog.qml
index b17a593b84..b17a593b84 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Dialog.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Dialog.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/DialogButtonBox.qml b/tests/auto/quickcontrols/customization/data/styles/simple/DialogButtonBox.qml
index b994d6a8b6..b994d6a8b6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/DialogButtonBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/DialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Drawer.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Drawer.qml
index 3b6257b4f2..3b6257b4f2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Drawer.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Drawer.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Frame.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Frame.qml
index e1730dfbe6..e1730dfbe6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Frame.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Frame.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/GroupBox.qml b/tests/auto/quickcontrols/customization/data/styles/simple/GroupBox.qml
index 9aaad3a0c1..9aaad3a0c1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/GroupBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/GroupBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ItemDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ItemDelegate.qml
index 0f5c22addd..0f5c22addd 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ItemDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ItemDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Label.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Label.qml
index f128725923..f128725923 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Label.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Label.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Menu.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Menu.qml
index f494d37711..f494d37711 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Menu.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Menu.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBar.qml b/tests/auto/quickcontrols/customization/data/styles/simple/MenuBar.qml
index ee6aecefe6..ee6aecefe6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/MenuBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBarItem.qml b/tests/auto/quickcontrols/customization/data/styles/simple/MenuBarItem.qml
index f0271ba20f..f0271ba20f 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuBarItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/MenuBarItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuItem.qml b/tests/auto/quickcontrols/customization/data/styles/simple/MenuItem.qml
index 7dee9ce2f3..7dee9ce2f3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuItem.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/MenuItem.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/simple/MenuSeparator.qml
index bbb90b6f62..bbb90b6f62 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/MenuSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/MenuSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Page.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Page.qml
index 4dc17112e9..4dc17112e9 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Page.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Page.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/PageIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/simple/PageIndicator.qml
index 59ce9282dc..59ce9282dc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/PageIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/PageIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Pane.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Pane.qml
index 0873baa770..0873baa770 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Pane.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Pane.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Popup.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Popup.qml
index ebdb88f8a2..ebdb88f8a2 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Popup.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Popup.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ProgressBar.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ProgressBar.qml
index c6cd7bb7d6..c6cd7bb7d6 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ProgressBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ProgressBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/RadioButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/RadioButton.qml
index a80230c455..a80230c455 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/RadioButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/RadioButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/RadioDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/simple/RadioDelegate.qml
index cdded1165c..cdded1165c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/RadioDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/RadioDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/RangeSlider.qml b/tests/auto/quickcontrols/customization/data/styles/simple/RangeSlider.qml
index 0227f4d296..0227f4d296 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/RangeSlider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/RangeSlider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/RoundButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/RoundButton.qml
index 0a9e5e13d1..0a9e5e13d1 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/RoundButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/RoundButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollBar.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollBar.qml
index a5cd90089c..a5cd90089c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollIndicator.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollIndicator.qml
index ce1d6a919c..ce1d6a919c 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollIndicator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollIndicator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollView.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollView.qml
index 765bb87f4a..765bb87f4a 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ScrollView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ScrollView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Slider.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Slider.qml
index b91e93941f..b91e93941f 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Slider.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Slider.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/SpinBox.qml b/tests/auto/quickcontrols/customization/data/styles/simple/SpinBox.qml
index 6c4cee6298..6c4cee6298 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/SpinBox.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/SpinBox.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/StackView.qml b/tests/auto/quickcontrols/customization/data/styles/simple/StackView.qml
index 35b668df49..35b668df49 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/StackView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/StackView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/simple/SwipeDelegate.qml
index 95ddab00cc..95ddab00cc 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/SwipeDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeView.qml b/tests/auto/quickcontrols/customization/data/styles/simple/SwipeView.qml
index 73ecba8586..73ecba8586 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/SwipeView.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/SwipeView.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Switch.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Switch.qml
index c8e42d3ada..c8e42d3ada 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Switch.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Switch.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/SwitchDelegate.qml b/tests/auto/quickcontrols/customization/data/styles/simple/SwitchDelegate.qml
index 00831df6c3..00831df6c3 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/SwitchDelegate.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/SwitchDelegate.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/TabBar.qml b/tests/auto/quickcontrols/customization/data/styles/simple/TabBar.qml
index 282a11aa52..282a11aa52 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/TabBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/TabBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/TabButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/TabButton.qml
index 83de47fe54..83de47fe54 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/TabButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/TabButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/TextArea.qml b/tests/auto/quickcontrols/customization/data/styles/simple/TextArea.qml
index 6125d255be..6125d255be 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/TextArea.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/TextArea.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/TextField.qml b/tests/auto/quickcontrols/customization/data/styles/simple/TextField.qml
index a49bbed804..a49bbed804 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/TextField.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/TextField.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolBar.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ToolBar.qml
index 0e7c697722..0e7c697722 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolBar.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ToolBar.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolButton.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ToolButton.qml
index e91a0d9335..e91a0d9335 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolButton.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ToolButton.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolSeparator.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ToolSeparator.qml
index c766f50754..c766f50754 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolSeparator.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ToolSeparator.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolTip.qml b/tests/auto/quickcontrols/customization/data/styles/simple/ToolTip.qml
index 58bf428f72..58bf428f72 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/ToolTip.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/ToolTip.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/Tumbler.qml b/tests/auto/quickcontrols/customization/data/styles/simple/Tumbler.qml
index 3e7a2f486b..3e7a2f486b 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/Tumbler.qml
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/Tumbler.qml
diff --git a/tests/auto/quickcontrols2/customization/data/styles/simple/qmldir b/tests/auto/quickcontrols/customization/data/styles/simple/qmldir
index e5159885cb..e5159885cb 100644
--- a/tests/auto/quickcontrols2/customization/data/styles/simple/qmldir
+++ b/tests/auto/quickcontrols/customization/data/styles/simple/qmldir
diff --git a/tests/auto/quickcontrols2/customization/dummy_imports.qml b/tests/auto/quickcontrols/customization/dummy_imports.qml
index 40d9cea712..40d9cea712 100644
--- a/tests/auto/quickcontrols2/customization/dummy_imports.qml
+++ b/tests/auto/quickcontrols/customization/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/customization/tst_customization.cpp b/tests/auto/quickcontrols/customization/tst_customization.cpp
index 1ee39ae254..1ee39ae254 100644
--- a/tests/auto/quickcontrols2/customization/tst_customization.cpp
+++ b/tests/auto/quickcontrols/customization/tst_customization.cpp
diff --git a/tests/auto/quickcontrols2/designer/CMakeLists.txt b/tests/auto/quickcontrols/designer/CMakeLists.txt
index 9ad0512f80..9ad0512f80 100644
--- a/tests/auto/quickcontrols2/designer/CMakeLists.txt
+++ b/tests/auto/quickcontrols/designer/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/designer/dummy_imports.qml b/tests/auto/quickcontrols/designer/dummy_imports.qml
index 401692e570..401692e570 100644
--- a/tests/auto/quickcontrols2/designer/dummy_imports.qml
+++ b/tests/auto/quickcontrols/designer/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/designer/tst_designer.cpp b/tests/auto/quickcontrols/designer/tst_designer.cpp
index 760f739a02..760f739a02 100644
--- a/tests/auto/quickcontrols2/designer/tst_designer.cpp
+++ b/tests/auto/quickcontrols/designer/tst_designer.cpp
diff --git a/tests/auto/quickcontrols2/focus/BLACKLIST b/tests/auto/quickcontrols/focus/BLACKLIST
index 730d384475..730d384475 100644
--- a/tests/auto/quickcontrols2/focus/BLACKLIST
+++ b/tests/auto/quickcontrols/focus/BLACKLIST
diff --git a/tests/auto/quickcontrols2/focus/CMakeLists.txt b/tests/auto/quickcontrols/focus/CMakeLists.txt
index 351bfce2c7..2fc401451f 100644
--- a/tests/auto/quickcontrols2/focus/CMakeLists.txt
+++ b/tests/auto/quickcontrols/focus/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_focus
     SOURCES
         tst_focus.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/focus/data/activeFocusOnTab.qml b/tests/auto/quickcontrols/focus/data/activeFocusOnTab.qml
index b158c673f0..b158c673f0 100644
--- a/tests/auto/quickcontrols2/focus/data/activeFocusOnTab.qml
+++ b/tests/auto/quickcontrols/focus/data/activeFocusOnTab.qml
diff --git a/tests/auto/quickcontrols2/focus/data/focusReason.qml b/tests/auto/quickcontrols/focus/data/focusReason.qml
index 0f8a61f05e..0f8a61f05e 100644
--- a/tests/auto/quickcontrols2/focus/data/focusReason.qml
+++ b/tests/auto/quickcontrols/focus/data/focusReason.qml
diff --git a/tests/auto/quickcontrols2/focus/data/keyNavigation.qml b/tests/auto/quickcontrols/focus/data/keyNavigation.qml
index f1a10a2569..f1a10a2569 100644
--- a/tests/auto/quickcontrols2/focus/data/keyNavigation.qml
+++ b/tests/auto/quickcontrols/focus/data/keyNavigation.qml
diff --git a/tests/auto/quickcontrols2/focus/data/visualFocus.qml b/tests/auto/quickcontrols/focus/data/visualFocus.qml
index ec35905e27..ec35905e27 100644
--- a/tests/auto/quickcontrols2/focus/data/visualFocus.qml
+++ b/tests/auto/quickcontrols/focus/data/visualFocus.qml
diff --git a/tests/auto/quickcontrols2/focus/tst_focus.cpp b/tests/auto/quickcontrols/focus/tst_focus.cpp
index ca70146885..ca70146885 100644
--- a/tests/auto/quickcontrols2/focus/tst_focus.cpp
+++ b/tests/auto/quickcontrols/focus/tst_focus.cpp
diff --git a/tests/auto/quickcontrols2/font/CMakeLists.txt b/tests/auto/quickcontrols/font/CMakeLists.txt
index a9e691287f..ab62726cd3 100644
--- a/tests/auto/quickcontrols2/font/CMakeLists.txt
+++ b/tests/auto/quickcontrols/font/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_font
     SOURCES
         tst_font.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/font/data/font-appwindow-custom.qml b/tests/auto/quickcontrols/font/data/font-appwindow-custom.qml
index fa621ae6a0..fa621ae6a0 100644
--- a/tests/auto/quickcontrols2/font/data/font-appwindow-custom.qml
+++ b/tests/auto/quickcontrols/font/data/font-appwindow-custom.qml
diff --git a/tests/auto/quickcontrols2/font/data/font-appwindow-default.qml b/tests/auto/quickcontrols/font/data/font-appwindow-default.qml
index f9c767b876..f9c767b876 100644
--- a/tests/auto/quickcontrols2/font/data/font-appwindow-default.qml
+++ b/tests/auto/quickcontrols/font/data/font-appwindow-default.qml
diff --git a/tests/auto/quickcontrols2/font/data/font-control-custom.qml b/tests/auto/quickcontrols/font/data/font-control-custom.qml
index c7ee583d04..c7ee583d04 100644
--- a/tests/auto/quickcontrols2/font/data/font-control-custom.qml
+++ b/tests/auto/quickcontrols/font/data/font-control-custom.qml
diff --git a/tests/auto/quickcontrols2/font/data/font-control-default.qml b/tests/auto/quickcontrols/font/data/font-control-default.qml
index 7cd58e12b3..7cd58e12b3 100644
--- a/tests/auto/quickcontrols2/font/data/font-control-default.qml
+++ b/tests/auto/quickcontrols/font/data/font-control-default.qml
diff --git a/tests/auto/quickcontrols2/font/data/font-popup-custom.qml b/tests/auto/quickcontrols/font/data/font-popup-custom.qml
index fcf942e3a5..fcf942e3a5 100644
--- a/tests/auto/quickcontrols2/font/data/font-popup-custom.qml
+++ b/tests/auto/quickcontrols/font/data/font-popup-custom.qml
diff --git a/tests/auto/quickcontrols2/font/data/font-popup-default.qml b/tests/auto/quickcontrols/font/data/font-popup-default.qml
index b9db73c9fb..b9db73c9fb 100644
--- a/tests/auto/quickcontrols2/font/data/font-popup-default.qml
+++ b/tests/auto/quickcontrols/font/data/font-popup-default.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-childcontrol.qml b/tests/auto/quickcontrols/font/data/inheritance-childcontrol.qml
index f476020517..f476020517 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-childcontrol.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-childcontrol.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-childpopup.qml b/tests/auto/quickcontrols/font/data/inheritance-childpopup.qml
index 8b7a033bd7..8b7a033bd7 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-childpopup.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-childpopup.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-control.qml b/tests/auto/quickcontrols/font/data/inheritance-control.qml
index 2cd5c125f4..2cd5c125f4 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-control.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-control.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildcontrol.qml b/tests/auto/quickcontrols/font/data/inheritance-dynamicchildcontrol.qml
index 18305058bc..18305058bc 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildcontrol.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-dynamicchildcontrol.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildpopup.qml b/tests/auto/quickcontrols/font/data/inheritance-dynamicchildpopup.qml
index 6b16f1a46b..6b16f1a46b 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-dynamicchildpopup.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-dynamicchildpopup.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-dynamiccontrol.qml b/tests/auto/quickcontrols/font/data/inheritance-dynamiccontrol.qml
index df0e13bf2c..df0e13bf2c 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-dynamiccontrol.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-dynamiccontrol.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-dynamicpopup.qml b/tests/auto/quickcontrols/font/data/inheritance-dynamicpopup.qml
index 76b7d7cbda..76b7d7cbda 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-dynamicpopup.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-dynamicpopup.qml
diff --git a/tests/auto/quickcontrols2/font/data/inheritance-popup.qml b/tests/auto/quickcontrols/font/data/inheritance-popup.qml
index a5010f0f11..a5010f0f11 100644
--- a/tests/auto/quickcontrols2/font/data/inheritance-popup.qml
+++ b/tests/auto/quickcontrols/font/data/inheritance-popup.qml
diff --git a/tests/auto/quickcontrols2/font/data/listview.qml b/tests/auto/quickcontrols/font/data/listview.qml
index aa07a337cf..aa07a337cf 100644
--- a/tests/auto/quickcontrols2/font/data/listview.qml
+++ b/tests/auto/quickcontrols/font/data/listview.qml
diff --git a/tests/auto/quickcontrols2/font/data/resolve.qml b/tests/auto/quickcontrols/font/data/resolve.qml
index 00e5c767bb..00e5c767bb 100644
--- a/tests/auto/quickcontrols2/font/data/resolve.qml
+++ b/tests/auto/quickcontrols/font/data/resolve.qml
diff --git a/tests/auto/quickcontrols2/font/tst_font.cpp b/tests/auto/quickcontrols/font/tst_font.cpp
index 26caf0c476..26caf0c476 100644
--- a/tests/auto/quickcontrols2/font/tst_font.cpp
+++ b/tests/auto/quickcontrols/font/tst_font.cpp
diff --git a/tests/auto/quickcontrols2/palette/CMakeLists.txt b/tests/auto/quickcontrols/palette/CMakeLists.txt
index 0c98cc28a6..d0dad952a6 100644
--- a/tests/auto/quickcontrols2/palette/CMakeLists.txt
+++ b/tests/auto/quickcontrols/palette/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_palette
     SOURCES
         tst_palette.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/palette/data/bindings.qml b/tests/auto/quickcontrols/palette/data/bindings.qml
index a584007e54..a584007e54 100644
--- a/tests/auto/quickcontrols2/palette/data/bindings.qml
+++ b/tests/auto/quickcontrols/palette/data/bindings.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-childcontrol.qml b/tests/auto/quickcontrols/palette/data/inheritance-childcontrol.qml
index f476020517..f476020517 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-childcontrol.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-childcontrol.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-childpopup.qml b/tests/auto/quickcontrols/palette/data/inheritance-childpopup.qml
index 8b7a033bd7..8b7a033bd7 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-childpopup.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-childpopup.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-control.qml b/tests/auto/quickcontrols/palette/data/inheritance-control.qml
index 2cd5c125f4..2cd5c125f4 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-control.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-control.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildcontrol.qml b/tests/auto/quickcontrols/palette/data/inheritance-dynamicchildcontrol.qml
index 18305058bc..18305058bc 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildcontrol.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-dynamicchildcontrol.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildpopup.qml b/tests/auto/quickcontrols/palette/data/inheritance-dynamicchildpopup.qml
index 6b16f1a46b..6b16f1a46b 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicchildpopup.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-dynamicchildpopup.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamiccontrol.qml b/tests/auto/quickcontrols/palette/data/inheritance-dynamiccontrol.qml
index df0e13bf2c..df0e13bf2c 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamiccontrol.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-dynamiccontrol.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicpopup.qml b/tests/auto/quickcontrols/palette/data/inheritance-dynamicpopup.qml
index 76b7d7cbda..76b7d7cbda 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-dynamicpopup.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-dynamicpopup.qml
diff --git a/tests/auto/quickcontrols2/palette/data/inheritance-popup.qml b/tests/auto/quickcontrols/palette/data/inheritance-popup.qml
index a5010f0f11..a5010f0f11 100644
--- a/tests/auto/quickcontrols2/palette/data/inheritance-popup.qml
+++ b/tests/auto/quickcontrols/palette/data/inheritance-popup.qml
diff --git a/tests/auto/quickcontrols2/palette/data/listview.qml b/tests/auto/quickcontrols/palette/data/listview.qml
index 92816fde19..92816fde19 100644
--- a/tests/auto/quickcontrols2/palette/data/listview.qml
+++ b/tests/auto/quickcontrols/palette/data/listview.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-appwindow-custom.qml b/tests/auto/quickcontrols/palette/data/palette-appwindow-custom.qml
index 22876b90fa..22876b90fa 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-appwindow-custom.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-appwindow-custom.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-appwindow-default.qml b/tests/auto/quickcontrols/palette/data/palette-appwindow-default.qml
index f9c767b876..f9c767b876 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-appwindow-default.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-appwindow-default.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-control-custom.qml b/tests/auto/quickcontrols/palette/data/palette-control-custom.qml
index 4c4206cdfd..4c4206cdfd 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-control-custom.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-control-custom.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-control-default.qml b/tests/auto/quickcontrols/palette/data/palette-control-default.qml
index 7cd58e12b3..7cd58e12b3 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-control-default.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-control-default.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-popup-custom.qml b/tests/auto/quickcontrols/palette/data/palette-popup-custom.qml
index c534d30156..c534d30156 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-popup-custom.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-popup-custom.qml
diff --git a/tests/auto/quickcontrols2/palette/data/palette-popup-default.qml b/tests/auto/quickcontrols/palette/data/palette-popup-default.qml
index b9db73c9fb..b9db73c9fb 100644
--- a/tests/auto/quickcontrols2/palette/data/palette-popup-default.qml
+++ b/tests/auto/quickcontrols/palette/data/palette-popup-default.qml
diff --git a/tests/auto/quickcontrols2/palette/data/resolve.qml b/tests/auto/quickcontrols/palette/data/resolve.qml
index 78cf091848..78cf091848 100644
--- a/tests/auto/quickcontrols2/palette/data/resolve.qml
+++ b/tests/auto/quickcontrols/palette/data/resolve.qml
diff --git a/tests/auto/quickcontrols2/palette/data/set-palette.qml b/tests/auto/quickcontrols/palette/data/set-palette.qml
index b987a7d6b1..b987a7d6b1 100644
--- a/tests/auto/quickcontrols2/palette/data/set-palette.qml
+++ b/tests/auto/quickcontrols/palette/data/set-palette.qml
diff --git a/tests/auto/quickcontrols2/palette/qtquickcontrols2.conf b/tests/auto/quickcontrols/palette/qtquickcontrols2.conf
index c5de6b36dd..c5de6b36dd 100644
--- a/tests/auto/quickcontrols2/palette/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/palette/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/palette/tst_palette.cpp b/tests/auto/quickcontrols/palette/tst_palette.cpp
index e3a53f0c21..e3a53f0c21 100644
--- a/tests/auto/quickcontrols2/palette/tst_palette.cpp
+++ b/tests/auto/quickcontrols/palette/tst_palette.cpp
diff --git a/tests/auto/quickcontrols2/platform/CMakeLists.txt b/tests/auto/quickcontrols/platform/CMakeLists.txt
index a2f77fdd9c..a2f77fdd9c 100644
--- a/tests/auto/quickcontrols2/platform/CMakeLists.txt
+++ b/tests/auto/quickcontrols/platform/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/platform/data/tst_colordialog.qml b/tests/auto/quickcontrols/platform/data/tst_colordialog.qml
index 093a99b31b..093a99b31b 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_colordialog.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_colordialog.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_filedialog.qml b/tests/auto/quickcontrols/platform/data/tst_filedialog.qml
index 63a6747e67..63a6747e67 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_filedialog.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_filedialog.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_folderdialog.qml b/tests/auto/quickcontrols/platform/data/tst_folderdialog.qml
index 67a5bf0ac0..67a5bf0ac0 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_folderdialog.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_folderdialog.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_fontdialog.qml b/tests/auto/quickcontrols/platform/data/tst_fontdialog.qml
index 884ea7e7d2..884ea7e7d2 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_fontdialog.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_fontdialog.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_menu.qml b/tests/auto/quickcontrols/platform/data/tst_menu.qml
index fb9949c8b7..fb9949c8b7 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_menu.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_menu.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_menubar.qml b/tests/auto/quickcontrols/platform/data/tst_menubar.qml
index ea0d005528..ea0d005528 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_menubar.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_menubar.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_menuitem.qml b/tests/auto/quickcontrols/platform/data/tst_menuitem.qml
index a446bf8c4d..a446bf8c4d 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_menuitem.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_menuitem.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_menuitemgroup.qml b/tests/auto/quickcontrols/platform/data/tst_menuitemgroup.qml
index 74f3a59a48..74f3a59a48 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_menuitemgroup.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_menuitemgroup.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_menuseparator.qml b/tests/auto/quickcontrols/platform/data/tst_menuseparator.qml
index 4fee4b9374..4fee4b9374 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_menuseparator.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_menuseparator.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_messagedialog.qml b/tests/auto/quickcontrols/platform/data/tst_messagedialog.qml
index 93ed4e261e..93ed4e261e 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_messagedialog.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_messagedialog.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_standardpaths.qml b/tests/auto/quickcontrols/platform/data/tst_standardpaths.qml
index 95cdbdf49d..95cdbdf49d 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_standardpaths.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_standardpaths.qml
diff --git a/tests/auto/quickcontrols2/platform/data/tst_systemtrayicon.qml b/tests/auto/quickcontrols/platform/data/tst_systemtrayicon.qml
index 3f043d275f..3f043d275f 100644
--- a/tests/auto/quickcontrols2/platform/data/tst_systemtrayicon.qml
+++ b/tests/auto/quickcontrols/platform/data/tst_systemtrayicon.qml
diff --git a/tests/auto/quickcontrols2/platform/tst_platform.cpp b/tests/auto/quickcontrols/platform/tst_platform.cpp
index 94bf1d6a59..94bf1d6a59 100644
--- a/tests/auto/quickcontrols2/platform/tst_platform.cpp
+++ b/tests/auto/quickcontrols/platform/tst_platform.cpp
diff --git a/tests/auto/quickcontrols2/pointerhandlers/CMakeLists.txt b/tests/auto/quickcontrols/pointerhandlers/CMakeLists.txt
index 6cd01e0fdd..6cd01e0fdd 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/CMakeLists.txt
+++ b/tests/auto/quickcontrols/pointerhandlers/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/pointerhandlers/data/controlandmousearea.qml b/tests/auto/quickcontrols/pointerhandlers/data/controlandmousearea.qml
index 00c680453a..00c680453a 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/data/controlandmousearea.qml
+++ b/tests/auto/quickcontrols/pointerhandlers/data/controlandmousearea.qml
diff --git a/tests/auto/quickcontrols2/pointerhandlers/data/controlinsidecontrol.qml b/tests/auto/quickcontrols/pointerhandlers/data/controlinsidecontrol.qml
index 69d855ec57..69d855ec57 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/data/controlinsidecontrol.qml
+++ b/tests/auto/quickcontrols/pointerhandlers/data/controlinsidecontrol.qml
diff --git a/tests/auto/quickcontrols2/pointerhandlers/data/draggableButton.qml b/tests/auto/quickcontrols/pointerhandlers/data/draggableButton.qml
index 288578acb3..288578acb3 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/data/draggableButton.qml
+++ b/tests/auto/quickcontrols/pointerhandlers/data/draggableButton.qml
diff --git a/tests/auto/quickcontrols2/pointerhandlers/data/tapHandlerButton.qml b/tests/auto/quickcontrols/pointerhandlers/data/tapHandlerButton.qml
index 4d5c70f544..4d5c70f544 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/data/tapHandlerButton.qml
+++ b/tests/auto/quickcontrols/pointerhandlers/data/tapHandlerButton.qml
diff --git a/tests/auto/quickcontrols2/pointerhandlers/tst_pointerhandlers.cpp b/tests/auto/quickcontrols/pointerhandlers/tst_pointerhandlers.cpp
index aa83175252..aa83175252 100644
--- a/tests/auto/quickcontrols2/pointerhandlers/tst_pointerhandlers.cpp
+++ b/tests/auto/quickcontrols/pointerhandlers/tst_pointerhandlers.cpp
diff --git a/tests/auto/quickcontrols2/pressandhold/CMakeLists.txt b/tests/auto/quickcontrols/pressandhold/CMakeLists.txt
index 8d8c967a56..8d8c967a56 100644
--- a/tests/auto/quickcontrols2/pressandhold/CMakeLists.txt
+++ b/tests/auto/quickcontrols/pressandhold/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/pressandhold/data/dependencies.qml b/tests/auto/quickcontrols/pressandhold/data/dependencies.qml
index 280cfd2962..280cfd2962 100644
--- a/tests/auto/quickcontrols2/pressandhold/data/dependencies.qml
+++ b/tests/auto/quickcontrols/pressandhold/data/dependencies.qml
diff --git a/tests/auto/quickcontrols2/pressandhold/tst_pressandhold.cpp b/tests/auto/quickcontrols/pressandhold/tst_pressandhold.cpp
index 98013a1d0c..98013a1d0c 100644
--- a/tests/auto/quickcontrols2/pressandhold/tst_pressandhold.cpp
+++ b/tests/auto/quickcontrols/pressandhold/tst_pressandhold.cpp
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/CMakeLists.txt b/tests/auto/quickcontrols/qquickapplicationwindow/CMakeLists.txt
index 0d506eb67c..9828a23490 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_qquickapplicationwindow
     SOURCES
         tst_qquickapplicationwindow.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/activeFocusControl.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/activeFocusControl.qml
index f699a27fc1..f699a27fc1 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/activeFocusControl.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/activeFocusControl.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/activefocusontab.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/activefocusontab.qml
index 7798c4ff1d..7798c4ff1d 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/activefocusontab.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/activefocusontab.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/attachedProperties.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/attachedProperties.qml
index 4bb773a831..4bb773a831 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/attachedProperties.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/attachedProperties.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/basicapplicationwindow.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/basicapplicationwindow.qml
index ba4bf1597e..ba4bf1597e 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/basicapplicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/basicapplicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/clearfocusondestruction.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/clearfocusondestruction.qml
index 56dfa89e68..56dfa89e68 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/clearfocusondestruction.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/clearfocusondestruction.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/defaultFocus.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/defaultFocus.qml
index 02ff15ff45..02ff15ff45 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/defaultFocus.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/defaultFocus.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/fill.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/fill.qml
index d57c4c4f71..d57c4c4f71 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/fill.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/fill.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/focusAfterPopupClosed.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/focusAfterPopupClosed.qml
index 5e13ac274a..5e13ac274a 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/focusAfterPopupClosed.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/focusAfterPopupClosed.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/font.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/font.qml
index 4f33439811..4f33439811 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/font.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/font.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/layout.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/layout.qml
index 11f2371673..11f2371673 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/layout.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/layout.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/layoutLayout.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/layoutLayout.qml
index e27fe07b12..e27fe07b12 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/layoutLayout.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/layoutLayout.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/locale.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/locale.qml
index 7e0b40095e..7e0b40095e 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/locale.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/locale.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/data/opacity.qml b/tests/auto/quickcontrols/qquickapplicationwindow/data/opacity.qml
index ea2de5ccd2..ea2de5ccd2 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/data/opacity.qml
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/data/opacity.qml
diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/quickcontrols/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
index e055340dde..e055340dde 100644
--- a/tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
+++ b/tests/auto/quickcontrols/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
diff --git a/tests/auto/quickcontrols2/qquickcolor/CMakeLists.txt b/tests/auto/quickcontrols/qquickcolor/CMakeLists.txt
index efd06f15ff..efd06f15ff 100644
--- a/tests/auto/quickcontrols2/qquickcolor/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickcolor/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/qquickcolor/data/tst_color.qml b/tests/auto/quickcontrols/qquickcolor/data/tst_color.qml
index d7b6848c3c..d7b6848c3c 100644
--- a/tests/auto/quickcontrols2/qquickcolor/data/tst_color.qml
+++ b/tests/auto/quickcontrols/qquickcolor/data/tst_color.qml
diff --git a/tests/auto/quickcontrols2/qquickcolor/tst_qquickcolor.cpp b/tests/auto/quickcontrols/qquickcolor/tst_qquickcolor.cpp
index ba92ef5b86..ba92ef5b86 100644
--- a/tests/auto/quickcontrols2/qquickcolor/tst_qquickcolor.cpp
+++ b/tests/auto/quickcontrols/qquickcolor/tst_qquickcolor.cpp
diff --git a/tests/auto/quickcontrols2/qquickcontrol/CMakeLists.txt b/tests/auto/quickcontrols/qquickcontrol/CMakeLists.txt
index a6726cb858..861d1388ab 100644
--- a/tests/auto/quickcontrols2/qquickcontrol/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickcontrol/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_qquickcontrol
     SOURCES
         tst_qquickcontrol.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquickcontrol/data/flickable.qml b/tests/auto/quickcontrols/qquickcontrol/data/flickable.qml
index 9378e3f9c0..9378e3f9c0 100644
--- a/tests/auto/quickcontrols2/qquickcontrol/data/flickable.qml
+++ b/tests/auto/quickcontrols/qquickcontrol/data/flickable.qml
diff --git a/tests/auto/quickcontrols2/qquickcontrol/data/fractionalFontSize.qml b/tests/auto/quickcontrols/qquickcontrol/data/fractionalFontSize.qml
index a4574e460e..a4574e460e 100644
--- a/tests/auto/quickcontrols2/qquickcontrol/data/fractionalFontSize.qml
+++ b/tests/auto/quickcontrols/qquickcontrol/data/fractionalFontSize.qml
diff --git a/tests/auto/quickcontrols2/qquickcontrol/data/resizeBackgroundKeepsBindings.qml b/tests/auto/quickcontrols/qquickcontrol/data/resizeBackgroundKeepsBindings.qml
index 9a6a159990..9a6a159990 100644
--- a/tests/auto/quickcontrols2/qquickcontrol/data/resizeBackgroundKeepsBindings.qml
+++ b/tests/auto/quickcontrols/qquickcontrol/data/resizeBackgroundKeepsBindings.qml
diff --git a/tests/auto/quickcontrols2/qquickcontrol/tst_qquickcontrol.cpp b/tests/auto/quickcontrols/qquickcontrol/tst_qquickcontrol.cpp
index ddb4b7ff8b..ddb4b7ff8b 100644
--- a/tests/auto/quickcontrols2/qquickcontrol/tst_qquickcontrol.cpp
+++ b/tests/auto/quickcontrols/qquickcontrol/tst_qquickcontrol.cpp
diff --git a/tests/auto/quickcontrols2/qquickdrawer/BLACKLIST b/tests/auto/quickcontrols/qquickdrawer/BLACKLIST
index 0a440d4ad3..0a440d4ad3 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickdrawer/BLACKLIST
diff --git a/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt b/tests/auto/quickcontrols/qquickdrawer/CMakeLists.txt
index b4690489e6..ed18a0c7e8 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickdrawer/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_qquickdrawer
     SOURCES
         tst_qquickdrawer.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-button.qml b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-button.qml
index ebba679f97..ebba679f97 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-button.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-button.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-hover.qml b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-hover.qml
index d3a9ba499f..d3a9ba499f 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-hover.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-hover.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-wheel.qml b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-wheel.qml
index f59bf5b2db..f59bf5b2db 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow-wheel.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow-wheel.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow.qml b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow.qml
index dcc37f4307..dcc37f4307 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/applicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/dragHandlerInteraction.qml b/tests/auto/quickcontrols/qquickdrawer/data/dragHandlerInteraction.qml
index a2774222f5..a2774222f5 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/dragHandlerInteraction.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/dragHandlerInteraction.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/dragOverModalShadow.qml b/tests/auto/quickcontrols/qquickdrawer/data/dragOverModalShadow.qml
index 73d01fe968..73d01fe968 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/dragOverModalShadow.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/dragOverModalShadow.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/flickable.qml b/tests/auto/quickcontrols/qquickdrawer/data/flickable.qml
index 4ef4605f72..4ef4605f72 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/flickable.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/flickable.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/grabber.qml b/tests/auto/quickcontrols/qquickdrawer/data/grabber.qml
index fdcce390d7..fdcce390d7 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/grabber.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/grabber.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/header.qml b/tests/auto/quickcontrols/qquickdrawer/data/header.qml
index c68202ab1d..c68202ab1d 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/header.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/header.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/multiTouch.qml b/tests/auto/quickcontrols/qquickdrawer/data/multiTouch.qml
index e9e9aa7a18..e9e9aa7a18 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/multiTouch.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/multiTouch.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/multiple.qml b/tests/auto/quickcontrols/qquickdrawer/data/multiple.qml
index 0f9f8ab63a..0f9f8ab63a 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/multiple.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/multiple.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/reposition.qml b/tests/auto/quickcontrols/qquickdrawer/data/reposition.qml
index 4c9eea2b67..4c9eea2b67 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/reposition.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/reposition.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/slider.qml b/tests/auto/quickcontrols/qquickdrawer/data/slider.qml
index f1deb12500..f1deb12500 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/slider.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/slider.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/topEdgeScreenEdge.qml b/tests/auto/quickcontrols/qquickdrawer/data/topEdgeScreenEdge.qml
index 8bf3b2b4fc..8bf3b2b4fc 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/topEdgeScreenEdge.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/topEdgeScreenEdge.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window-button.qml b/tests/auto/quickcontrols/qquickdrawer/data/window-button.qml
index 2f0d4af7e6..2f0d4af7e6 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window-button.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/window-button.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window-hover.qml b/tests/auto/quickcontrols/qquickdrawer/data/window-hover.qml
index 81a14dc700..81a14dc700 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window-hover.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/window-hover.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window-wheel.qml b/tests/auto/quickcontrols/qquickdrawer/data/window-wheel.qml
index 802c60bf1c..802c60bf1c 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window-wheel.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/window-wheel.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/data/window.qml b/tests/auto/quickcontrols/qquickdrawer/data/window.qml
index fbdc4047d7..fbdc4047d7 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/data/window.qml
+++ b/tests/auto/quickcontrols/qquickdrawer/data/window.qml
diff --git a/tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer.cpp b/tests/auto/quickcontrols/qquickdrawer/tst_qquickdrawer.cpp
index 344d96b6fb..344d96b6fb 100644
--- a/tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer.cpp
+++ b/tests/auto/quickcontrols/qquickdrawer/tst_qquickdrawer.cpp
diff --git a/tests/auto/quickcontrols2/qquickheaderview/CMakeLists.txt b/tests/auto/quickcontrols/qquickheaderview/CMakeLists.txt
index 404f49e0f8..095ebaf6f5 100644
--- a/tests/auto/quickcontrols2/qquickheaderview/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickheaderview/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_qquickheaderview
     SOURCES
         tst_qquickheaderview.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquickheaderview/data/ListModel.qml b/tests/auto/quickcontrols/qquickheaderview/data/ListModel.qml
index de63fc600b..de63fc600b 100644
--- a/tests/auto/quickcontrols2/qquickheaderview/data/ListModel.qml
+++ b/tests/auto/quickcontrols/qquickheaderview/data/ListModel.qml
diff --git a/tests/auto/quickcontrols2/qquickheaderview/data/Window.qml b/tests/auto/quickcontrols/qquickheaderview/data/Window.qml
index 6082fab42e..6082fab42e 100644
--- a/tests/auto/quickcontrols2/qquickheaderview/data/Window.qml
+++ b/tests/auto/quickcontrols/qquickheaderview/data/Window.qml
diff --git a/tests/auto/quickcontrols2/qquickheaderview/tst_qquickheaderview.cpp b/tests/auto/quickcontrols/qquickheaderview/tst_qquickheaderview.cpp
index 28b92fef71..28b92fef71 100644
--- a/tests/auto/quickcontrols2/qquickheaderview/tst_qquickheaderview.cpp
+++ b/tests/auto/quickcontrols/qquickheaderview/tst_qquickheaderview.cpp
diff --git a/tests/auto/quickcontrols2/qquickiconimage/BLACKLIST b/tests/auto/quickcontrols/qquickiconimage/BLACKLIST
index 70c935375d..70c935375d 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickiconimage/BLACKLIST
diff --git a/tests/auto/quickcontrols2/qquickiconimage/CMakeLists.txt b/tests/auto/quickcontrols/qquickiconimage/CMakeLists.txt
index 0570cc9b39..4e2794f8e4 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickiconimage/CMakeLists.txt
@@ -27,7 +27,7 @@ qt_internal_add_test(tst_qquickiconimage
     SOURCES
         tst_qquickiconimage.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::QuickControls2ImplPrivate
         Qt::QuickPrivate
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/alignment.qml b/tests/auto/quickcontrols/qquickiconimage/data/alignment.qml
index e6861520b9..e6861520b9 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/alignment.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/alignment.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/color.qml b/tests/auto/quickcontrols/qquickiconimage/data/color.qml
index b44b43885c..b44b43885c 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/color.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/color.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/fileSelectors.qml b/tests/auto/quickcontrols/qquickiconimage/data/fileSelectors.qml
index e6861520b9..e6861520b9 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/fileSelectors.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/fileSelectors.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/imageProvider.qml b/tests/auto/quickcontrols/qquickiconimage/data/imageProvider.qml
index 9b18a99e35..9b18a99e35 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/imageProvider.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/imageProvider.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingNoSizes.qml b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingNoSizes.qml
index d457d205d5..d457d205d5 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingNoSizes.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingNoSizes.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSize.qml b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingSourceSize.qml
index e6861520b9..e6861520b9 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSize.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingSourceSize.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
index 5e7ebefca4..5e7ebefca4 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/root.qml b/tests/auto/quickcontrols/qquickiconimage/data/root.qml
index ed02d2df7a..ed02d2df7a 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/root.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/root.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingNoSizes.qml b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingNoSizes.qml
index 34fc6b339c..34fc6b339c 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingNoSizes.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingNoSizes.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSize.qml b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceSize.qml
index 9f1b629074..9f1b629074 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSize.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceSize.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
index 4dc3ac7588..4dc3ac7588 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceTooLarge.qml b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceTooLarge.qml
index a54d998aa5..a54d998aa5 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/sourceBindingSourceTooLarge.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/sourceBindingSourceTooLarge.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/svgNoSizes.qml b/tests/auto/quickcontrols/qquickiconimage/data/svgNoSizes.qml
index e29c23c5b2..e29c23c5b2 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/svgNoSizes.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/svgNoSizes.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/svgSourceBindingSourceSize.qml b/tests/auto/quickcontrols/qquickiconimage/data/svgSourceBindingSourceSize.qml
index 4674e8f14b..4674e8f14b 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/svgSourceBindingSourceSize.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/svgSourceBindingSourceSize.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/data/translucentColors.qml b/tests/auto/quickcontrols/qquickiconimage/data/translucentColors.qml
index 61ad329d55..61ad329d55 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/data/translucentColors.qml
+++ b/tests/auto/quickcontrols/qquickiconimage/data/translucentColors.qml
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png
index 4356af9516..4356af9516 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png
index d3134a55d4..d3134a55d4 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png
index 250b94b019..250b94b019 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png
index 04cd010a68..04cd010a68 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png
index a63bbaf4c5..a63bbaf4c5 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png
index c17d166402..c17d166402 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png
index d4411658f9..d4411658f9 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png
index 6f7938e365..6f7938e365 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png
index 9215fc423b..9215fc423b 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png
index 250b94b019..250b94b019 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png
index a63bbaf4c5..a63bbaf4c5 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/appointment-new.svg b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/appointment-new.svg
index 4cb14f82f0..4cb14f82f0 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/appointment-new.svg
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/appointment-new.svg
diff --git a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/index.theme b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/index.theme
index 6ab6c15c42..6ab6c15c42 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/icons/testtheme/index.theme
+++ b/tests/auto/quickcontrols/qquickiconimage/icons/testtheme/index.theme
diff --git a/tests/auto/quickcontrols2/qquickiconimage/tst_qquickiconimage.cpp b/tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage.cpp
index 83df118de3..83df118de3 100644
--- a/tests/auto/quickcontrols2/qquickiconimage/tst_qquickiconimage.cpp
+++ b/tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage.cpp
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/CMakeLists.txt b/tests/auto/quickcontrols/qquickiconlabel/CMakeLists.txt
index 6f8a72ab3a..dc543c5267 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickiconlabel/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_qquickiconlabel
     SOURCES
         tst_qquickiconlabel.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::QuickControls2ImplPrivate
         Qt::QuickPrivate
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/a.png b/tests/auto/quickcontrols/qquickiconlabel/data/a.png
index fe839a40e4..fe839a40e4 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/a.png
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/a.png
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/colorChanges.qml b/tests/auto/quickcontrols/qquickiconlabel/data/colorChanges.qml
index 35785313db..35785313db 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/colorChanges.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/colorChanges.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/iconSourceContext.qml b/tests/auto/quickcontrols/qquickiconlabel/data/iconSourceContext.qml
index 8cf09666d0..8cf09666d0 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/iconSourceContext.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/iconSourceContext.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/iconlabel.qml b/tests/auto/quickcontrols/qquickiconlabel/data/iconlabel.qml
index e181526cfd..e181526cfd 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/iconlabel.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/iconlabel.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyIcon.qml b/tests/auto/quickcontrols/qquickiconlabel/data/spacingWithOnlyIcon.qml
index a1d90afbf4..a1d90afbf4 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyIcon.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/spacingWithOnlyIcon.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyText.qml b/tests/auto/quickcontrols/qquickiconlabel/data/spacingWithOnlyText.qml
index 5894434b30..5894434b30 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/spacingWithOnlyText.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/spacingWithOnlyText.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/data/sub/Actions.qml b/tests/auto/quickcontrols/qquickiconlabel/data/sub/Actions.qml
index 20bd6a5e6b..20bd6a5e6b 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/data/sub/Actions.qml
+++ b/tests/auto/quickcontrols/qquickiconlabel/data/sub/Actions.qml
diff --git a/tests/auto/quickcontrols2/qquickiconlabel/tst_qquickiconlabel.cpp b/tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel.cpp
index 8d42cf5faf..8d42cf5faf 100644
--- a/tests/auto/quickcontrols2/qquickiconlabel/tst_qquickiconlabel.cpp
+++ b/tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel.cpp
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/BLACKLIST b/tests/auto/quickcontrols/qquickimaginestyle/BLACKLIST
index 27e33c71b3..27e33c71b3 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickimaginestyle/BLACKLIST
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/CMakeLists.txt b/tests/auto/quickcontrols/qquickimaginestyle/CMakeLists.txt
index 1985784386..1985784386 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickimaginestyle/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/control-assets/button-background.9.png b/tests/auto/quickcontrols/qquickimaginestyle/control-assets/button-background.9.png
index 18ec9e6f4f..18ec9e6f4f 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/control-assets/button-background.9.png
+++ b/tests/auto/quickcontrols/qquickimaginestyle/control-assets/button-background.9.png
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/data/tst_imagine.qml b/tests/auto/quickcontrols/qquickimaginestyle/data/tst_imagine.qml
index c6bb83f72a..c6bb83f72a 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/data/tst_imagine.qml
+++ b/tests/auto/quickcontrols/qquickimaginestyle/data/tst_imagine.qml
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickimaginestyle/qtquickcontrols2.conf
index cc58a8e374..cc58a8e374 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickimaginestyle/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-1.png b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/button-background-1.png
index 980eec3c92..980eec3c92 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-1.png
+++ b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/button-background-1.png
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-2.png b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/button-background-2.png
index 8e2639d03b..8e2639d03b 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/button-background-2.png
+++ b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/button-background-2.png
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/wobble.frag.qsb b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/wobble.frag.qsb
index 248c00b526..248c00b526 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/test-assets/wobble.frag.qsb
+++ b/tests/auto/quickcontrols/qquickimaginestyle/test-assets/wobble.frag.qsb
diff --git a/tests/auto/quickcontrols2/qquickimaginestyle/tst_qquickimaginestyle.cpp b/tests/auto/quickcontrols/qquickimaginestyle/tst_qquickimaginestyle.cpp
index 6cdbbca8e9..6cdbbca8e9 100644
--- a/tests/auto/quickcontrols2/qquickimaginestyle/tst_qquickimaginestyle.cpp
+++ b/tests/auto/quickcontrols/qquickimaginestyle/tst_qquickimaginestyle.cpp
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyle/CMakeLists.txt b/tests/auto/quickcontrols/qquickmaterialstyle/CMakeLists.txt
index 784da21614..784da21614 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyle/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickmaterialstyle/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyle/data/tst_material.qml b/tests/auto/quickcontrols/qquickmaterialstyle/data/tst_material.qml
index 34754420d0..34754420d0 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyle/data/tst_material.qml
+++ b/tests/auto/quickcontrols/qquickmaterialstyle/data/tst_material.qml
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyle/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickmaterialstyle/qtquickcontrols2.conf
index b6c7c87ea1..b6c7c87ea1 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyle/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickmaterialstyle/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyle/tst_qquickmaterialstyle.cpp b/tests/auto/quickcontrols/qquickmaterialstyle/tst_qquickmaterialstyle.cpp
index 3594f4b1b0..3594f4b1b0 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyle/tst_qquickmaterialstyle.cpp
+++ b/tests/auto/quickcontrols/qquickmaterialstyle/tst_qquickmaterialstyle.cpp
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/quickcontrols/qquickmaterialstyleconf/CMakeLists.txt
index 66b999193d..864914711b 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_qquickmaterialstyleconf
     SOURCES
         tst_qquickmaterialstyleconf.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/data/applicationwindow.qml b/tests/auto/quickcontrols/qquickmaterialstyleconf/data/applicationwindow.qml
index 40a384c42f..40a384c42f 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/data/applicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickmaterialstyleconf/qtquickcontrols2.conf
index 30cee878be..30cee878be 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp b/tests/auto/quickcontrols/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp
index 722f846d90..722f846d90 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-dense.conf b/tests/auto/quickcontrols/qquickmaterialstyleconf/variant-dense.conf
index 6636894ea4..6636894ea4 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-dense.conf
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/variant-dense.conf
diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-normal.conf b/tests/auto/quickcontrols/qquickmaterialstyleconf/variant-normal.conf
index 08778e92a4..08778e92a4 100644
--- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/variant-normal.conf
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/variant-normal.conf
diff --git a/tests/auto/quickcontrols2/qquickmenu/BLACKLIST b/tests/auto/quickcontrols/qquickmenu/BLACKLIST
index fed4c6e561..fed4c6e561 100644
--- a/tests/auto/quickcontrols2/qquickmenu/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickmenu/BLACKLIST
diff --git a/tests/auto/quickcontrols2/qquickmenu/CMakeLists.txt b/tests/auto/quickcontrols/qquickmenu/CMakeLists.txt
index aa5518b31b..84499748b1 100644
--- a/tests/auto/quickcontrols2/qquickmenu/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickmenu/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_qquickmenu
     SOURCES
         tst_qquickmenu.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/actionShortcuts.qml b/tests/auto/quickcontrols/qquickmenu/data/actionShortcuts.qml
index 3d839b98d4..3d839b98d4 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/actionShortcuts.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/actionShortcuts.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/actions.qml b/tests/auto/quickcontrols/qquickmenu/data/actions.qml
index 0c4449d888..0c4449d888 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/actions.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/actions.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/addItem.qml b/tests/auto/quickcontrols/qquickmenu/data/addItem.qml
index 5678210e25..5678210e25 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/addItem.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/addItem.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/applicationWindowScrollable.qml b/tests/auto/quickcontrols/qquickmenu/data/applicationWindowScrollable.qml
index eb8140eea5..eb8140eea5 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/applicationWindowScrollable.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/applicationWindowScrollable.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/applicationwindow.qml b/tests/auto/quickcontrols/qquickmenu/data/applicationwindow.qml
index 1b42ee6965..1b42ee6965 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/applicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/customMenuCullItems.qml b/tests/auto/quickcontrols/qquickmenu/data/customMenuCullItems.qml
index 0f56ecdd87..0f56ecdd87 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/customMenuCullItems.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/customMenuCullItems.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/customMenuUseRepeaterAsTheContentItem.qml b/tests/auto/quickcontrols/qquickmenu/data/customMenuUseRepeaterAsTheContentItem.qml
index bfa8f66be5..bfa8f66be5 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/customMenuUseRepeaterAsTheContentItem.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/customMenuUseRepeaterAsTheContentItem.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/delegateFromSeparateComponent.qml b/tests/auto/quickcontrols/qquickmenu/data/delegateFromSeparateComponent.qml
index 44a7d8d54a..44a7d8d54a 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/delegateFromSeparateComponent.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/delegateFromSeparateComponent.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/disableWhenTriggered.qml b/tests/auto/quickcontrols/qquickmenu/data/disableWhenTriggered.qml
index e59026677a..e59026677a 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/disableWhenTriggered.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/disableWhenTriggered.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/disabledMenuItemKeyNavigation.qml b/tests/auto/quickcontrols/qquickmenu/data/disabledMenuItemKeyNavigation.qml
index c9c893bb9c..c9c893bb9c 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/disabledMenuItemKeyNavigation.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/disabledMenuItemKeyNavigation.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml b/tests/auto/quickcontrols/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
index 1db3e351bc..1db3e351bc 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/giveMenuItemFocusOnButtonPress.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/menuItemWidths.qml b/tests/auto/quickcontrols/qquickmenu/data/menuItemWidths.qml
index ff99abd399..ff99abd399 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/menuItemWidths.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/menuItemWidths.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/menuSeparator.qml b/tests/auto/quickcontrols/qquickmenu/data/menuSeparator.qml
index b13cd534fd..b13cd534fd 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/menuSeparator.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/menuSeparator.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/mnemonics.qml b/tests/auto/quickcontrols/qquickmenu/data/mnemonics.qml
index 8929b00275..8929b00275 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/mnemonics.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/mnemonics.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/order.qml b/tests/auto/quickcontrols/qquickmenu/data/order.qml
index 185c9e45c3..185c9e45c3 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/order.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/order.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/popup.qml b/tests/auto/quickcontrols/qquickmenu/data/popup.qml
index 8201c9e03f..8201c9e03f 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/popup.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/popup.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/pressAndHold.qml b/tests/auto/quickcontrols/qquickmenu/data/pressAndHold.qml
index ac0f394604..ac0f394604 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/pressAndHold.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/pressAndHold.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/removeTakeItem.qml b/tests/auto/quickcontrols/qquickmenu/data/removeTakeItem.qml
index aa321cb3a9..aa321cb3a9 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/removeTakeItem.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/removeTakeItem.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/repeater.qml b/tests/auto/quickcontrols/qquickmenu/data/repeater.qml
index 3c056a1d38..3c056a1d38 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/repeater.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/repeater.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/scrollableWithPadding.qml b/tests/auto/quickcontrols/qquickmenu/data/scrollableWithPadding.qml
index 842cb33bfd..842cb33bfd 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/scrollableWithPadding.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/scrollableWithPadding.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/subMenuDisabled.qml b/tests/auto/quickcontrols/qquickmenu/data/subMenuDisabled.qml
index 4d5db0bd67..4d5db0bd67 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/subMenuDisabled.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/subMenuDisabled.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/subMenus.qml b/tests/auto/quickcontrols/qquickmenu/data/subMenus.qml
index 280fd404e8..280fd404e8 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/subMenus.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/subMenus.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/data/windowScrollable.qml b/tests/auto/quickcontrols/qquickmenu/data/windowScrollable.qml
index 97a06da63d..97a06da63d 100644
--- a/tests/auto/quickcontrols2/qquickmenu/data/windowScrollable.qml
+++ b/tests/auto/quickcontrols/qquickmenu/data/windowScrollable.qml
diff --git a/tests/auto/quickcontrols2/qquickmenu/tst_qquickmenu.cpp b/tests/auto/quickcontrols/qquickmenu/tst_qquickmenu.cpp
index 6a1d1ab803..6a1d1ab803 100644
--- a/tests/auto/quickcontrols2/qquickmenu/tst_qquickmenu.cpp
+++ b/tests/auto/quickcontrols/qquickmenu/tst_qquickmenu.cpp
diff --git a/tests/auto/quickcontrols2/qquickmenubar/BLACKLIST b/tests/auto/quickcontrols/qquickmenubar/BLACKLIST
index f059750550..f059750550 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickmenubar/BLACKLIST
diff --git a/tests/auto/quickcontrols2/qquickmenubar/CMakeLists.txt b/tests/auto/quickcontrols/qquickmenubar/CMakeLists.txt
index 34333550b9..081084818b 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickmenubar/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_qquickmenubar
     SOURCES
         tst_qquickmenubar.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquickmenubar/data/checkHighlightWhenDismissed.qml b/tests/auto/quickcontrols/qquickmenubar/data/checkHighlightWhenDismissed.qml
index 2f8132e2fc..2f8132e2fc 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/data/checkHighlightWhenDismissed.qml
+++ b/tests/auto/quickcontrols/qquickmenubar/data/checkHighlightWhenDismissed.qml
diff --git a/tests/auto/quickcontrols2/qquickmenubar/data/delegateFromSeparateComponent.qml b/tests/auto/quickcontrols/qquickmenubar/data/delegateFromSeparateComponent.qml
index ac03210fa0..ac03210fa0 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/data/delegateFromSeparateComponent.qml
+++ b/tests/auto/quickcontrols/qquickmenubar/data/delegateFromSeparateComponent.qml
diff --git a/tests/auto/quickcontrols2/qquickmenubar/data/empty.qml b/tests/auto/quickcontrols/qquickmenubar/data/empty.qml
index 870c3a0bc4..870c3a0bc4 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/data/empty.qml
+++ b/tests/auto/quickcontrols/qquickmenubar/data/empty.qml
diff --git a/tests/auto/quickcontrols2/qquickmenubar/data/menubar.qml b/tests/auto/quickcontrols/qquickmenubar/data/menubar.qml
index 9edb7606ba..9edb7606ba 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/data/menubar.qml
+++ b/tests/auto/quickcontrols/qquickmenubar/data/menubar.qml
diff --git a/tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar.cpp b/tests/auto/quickcontrols/qquickmenubar/tst_qquickmenubar.cpp
index 95006ba77c..95006ba77c 100644
--- a/tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar.cpp
+++ b/tests/auto/quickcontrols/qquickmenubar/tst_qquickmenubar.cpp
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/CMakeLists.txt b/tests/auto/quickcontrols/qquickninepatchimage/CMakeLists.txt
index 682d947cdc..3151a57df0 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickninepatchimage/CMakeLists.txt
@@ -27,7 +27,7 @@ qt_internal_add_test(tst_qquickninepatchimage
     SOURCES
         tst_qquickninepatchimage.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/foo.9.png
index bac09a4d1a..bac09a4d1a 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/foo.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@2x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@2x.9.png
index 43e4b47881..43e4b47881 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@2x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@2x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@3x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@3x.9.png
index 4d199c8424..4d199c8424 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@3x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@3x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@4x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@4x.9.png
index 018b8341a2..018b8341a2 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/foo@4x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/foo@4x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all.9.png
index a189942957..a189942957 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@2x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@2x.9.png
index d00d719cc2..d00d719cc2 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@2x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@2x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@3x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@3x.9.png
index 6130fd5020..6130fd5020 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@3x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@3x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@4x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@4x.9.png
index 2c2d1694d4..2c2d1694d4 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-all@4x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-all@4x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright.9.png
index 2b3e58cbf1..2b3e58cbf1 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@2x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@2x.9.png
index 70aceb618f..70aceb618f 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@2x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@2x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@3x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@3x.9.png
index 032400ceda..032400ceda 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@3x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@3x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@4x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@4x.9.png
index d5cf85aa10..d5cf85aa10 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-bottomright@4x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-bottomright@4x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft.9.png
index 05a2ff703c..05a2ff703c 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@2x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@2x.9.png
index a88f87a5ce..a88f87a5ce 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@2x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@2x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@3x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@3x.9.png
index 16349d2287..16349d2287 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@3x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@3x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@4x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@4x.9.png
index 160fab6164..160fab6164 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/inset-topleft@4x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/inset-topleft@4x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/ninepatchimage.qml b/tests/auto/quickcontrols/qquickninepatchimage/data/ninepatchimage.qml
index 410a61f9fe..410a61f9fe 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/ninepatchimage.qml
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/ninepatchimage.qml
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/padding.9.png
index 8a65afadec..8a65afadec 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/padding.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@2x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@2x.9.png
index 101fc0cbbe..101fc0cbbe 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@2x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@2x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@3x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@3x.9.png
index e07a93a231..e07a93a231 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@3x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@3x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@4x.9.png b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@4x.9.png
index a3506444b1..a3506444b1 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/data/padding@4x.9.png
+++ b/tests/auto/quickcontrols/qquickninepatchimage/data/padding@4x.9.png
diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/tst_qquickninepatchimage.cpp b/tests/auto/quickcontrols/qquickninepatchimage/tst_qquickninepatchimage.cpp
index c1fb1f7264..c1fb1f7264 100644
--- a/tests/auto/quickcontrols2/qquickninepatchimage/tst_qquickninepatchimage.cpp
+++ b/tests/auto/quickcontrols/qquickninepatchimage/tst_qquickninepatchimage.cpp
diff --git a/tests/auto/quickcontrols2/qquickpopup/BLACKLIST b/tests/auto/quickcontrols/qquickpopup/BLACKLIST
index aa31440328..aa31440328 100644
--- a/tests/auto/quickcontrols2/qquickpopup/BLACKLIST
+++ b/tests/auto/quickcontrols/qquickpopup/BLACKLIST
diff --git a/tests/auto/quickcontrols2/qquickpopup/CMakeLists.txt b/tests/auto/quickcontrols/qquickpopup/CMakeLists.txt
index 1eed1db600..2f89595851 100644
--- a/tests/auto/quickcontrols2/qquickpopup/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickpopup/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_qquickpopup
     SOURCES
         tst_qquickpopup.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusAfterExit.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusAfterExit.qml
index 359dc772f2..359dc772f2 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusAfterExit.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusAfterExit.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose1.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose1.qml
index 81893bbcbd..81893bbcbd 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose1.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose1.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose2.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose2.qml
index 6cb1c5ad07..6cb1c5ad07 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose2.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose2.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose3.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose3.qml
index 89165e355e..89165e355e 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClose3.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClose3.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
index 3a85f7d580..3a85f7d580 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnDelayedEnter.qml b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnDelayedEnter.qml
index 37a595ec25..37a595ec25 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/activeFocusOnDelayedEnter.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/activeFocusOnDelayedEnter.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-hover.qml b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow-hover.qml
index d4c8b78355..d4c8b78355 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-hover.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow-hover.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-wheel.qml b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow-wheel.qml
index 1668b042e0..1668b042e0 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow-wheel.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow-wheel.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow.qml b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow.qml
index 46c4dda18b..46c4dda18b 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/applicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/centerInOverlayWithinStackViewItem.qml b/tests/auto/quickcontrols/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
index 1c96bb687c..1c96bb687c 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithNestedPopups.qml b/tests/auto/quickcontrols/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
index 6aeede9aff..6aeede9aff 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml b/tests/auto/quickcontrols/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
index b1d7413e9b..b1d7413e9b 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/countChanged.qml b/tests/auto/quickcontrols/qquickpopup/data/countChanged.qml
index e95be76e56..e95be76e56 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/countChanged.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/countChanged.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/cursor.qml b/tests/auto/quickcontrols/qquickpopup/data/cursor.qml
index 3eefa7570e..3eefa7570e 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/cursor.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/cursor.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/destroyDuringExitTransition.qml b/tests/auto/quickcontrols/qquickpopup/data/destroyDuringExitTransition.qml
index dacffd3199..dacffd3199 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/destroyDuringExitTransition.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/destroyDuringExitTransition.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/dialog.qml b/tests/auto/quickcontrols/qquickpopup/data/dialog.qml
index 112bfaefcd..112bfaefcd 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/dialog.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/dialog.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/dimmerContainmentMask.qml b/tests/auto/quickcontrols/qquickpopup/data/dimmerContainmentMask.qml
index 30a412a1cc..30a412a1cc 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/dimmerContainmentMask.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/dimmerContainmentMask.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/disabledPalette.qml b/tests/auto/quickcontrols/qquickpopup/data/disabledPalette.qml
index 4b54b5b1fd..4b54b5b1fd 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/disabledPalette.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/disabledPalette.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/grabber.qml b/tests/auto/quickcontrols/qquickpopup/data/grabber.qml
index ec76829f4f..ec76829f4f 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/grabber.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/grabber.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/invisibleToolTipOpen.qml b/tests/auto/quickcontrols/qquickpopup/data/invisibleToolTipOpen.qml
index 6607dc6fd5..6607dc6fd5 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/invisibleToolTipOpen.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/invisibleToolTipOpen.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/modelessOnModalOnModeless.qml b/tests/auto/quickcontrols/qquickpopup/data/modelessOnModalOnModeless.qml
index 5da5a5524b..5da5a5524b 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/modelessOnModalOnModeless.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/modelessOnModalOnModeless.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/nested.qml b/tests/auto/quickcontrols/qquickpopup/data/nested.qml
index d88142f661..d88142f661 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/nested.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/nested.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/orientation.qml b/tests/auto/quickcontrols/qquickpopup/data/orientation.qml
index 198f716fc0..198f716fc0 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/orientation.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/orientation.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/relativeZOrder.qml b/tests/auto/quickcontrols/qquickpopup/data/relativeZOrder.qml
index 41ca158969..41ca158969 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/relativeZOrder.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/relativeZOrder.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/releaseAfterExitTransition.qml b/tests/auto/quickcontrols/qquickpopup/data/releaseAfterExitTransition.qml
index f3a1f218c1..f3a1f218c1 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/releaseAfterExitTransition.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/releaseAfterExitTransition.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/shrinkPopupThatWasLargerThanWindowHeight.qml b/tests/auto/quickcontrols/qquickpopup/data/shrinkPopupThatWasLargerThanWindowHeight.qml
index b9b8874622..b9b8874622 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/shrinkPopupThatWasLargerThanWindowHeight.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/shrinkPopupThatWasLargerThanWindowHeight.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/shrinkPopupThatWasLargerThanWindowWidth.qml b/tests/auto/quickcontrols/qquickpopup/data/shrinkPopupThatWasLargerThanWindowWidth.qml
index aa78353eb0..aa78353eb0 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/shrinkPopupThatWasLargerThanWindowWidth.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/shrinkPopupThatWasLargerThanWindowWidth.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/tabFence.qml b/tests/auto/quickcontrols/qquickpopup/data/tabFence.qml
index a96cf1687c..a96cf1687c 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/tabFence.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/tabFence.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/toolTipCrashOnClose.qml b/tests/auto/quickcontrols/qquickpopup/data/toolTipCrashOnClose.qml
index f40fa0939c..f40fa0939c 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/toolTipCrashOnClose.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/toolTipCrashOnClose.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/window-hover.qml b/tests/auto/quickcontrols/qquickpopup/data/window-hover.qml
index fa61e8b706..fa61e8b706 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/window-hover.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/window-hover.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/window-wheel.qml b/tests/auto/quickcontrols/qquickpopup/data/window-wheel.qml
index ae9c2ecdfd..ae9c2ecdfd 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/window-wheel.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/window-wheel.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/data/window.qml b/tests/auto/quickcontrols/qquickpopup/data/window.qml
index 6ffe5165fe..6ffe5165fe 100644
--- a/tests/auto/quickcontrols2/qquickpopup/data/window.qml
+++ b/tests/auto/quickcontrols/qquickpopup/data/window.qml
diff --git a/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp b/tests/auto/quickcontrols/qquickpopup/tst_qquickpopup.cpp
index 607603d28f..607603d28f 100644
--- a/tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/quickcontrols/qquickpopup/tst_qquickpopup.cpp
diff --git a/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt b/tests/auto/quickcontrols/qquickstyle/CMakeLists.txt
index 92cf7991e2..86f0cd278a 100644
--- a/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickstyle/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_qquickstyle
     SOURCES
         tst_qquickstyle.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/Control.qml b/tests/auto/quickcontrols/qquickstyle/data/CmdLineArgStyle/Control.qml
index 744dcd8f08..744dcd8f08 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/Control.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/CmdLineArgStyle/Control.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/qmldir b/tests/auto/quickcontrols/qquickstyle/data/CmdLineArgStyle/qmldir
index c2cc85c263..c2cc85c263 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/qmldir
+++ b/tests/auto/quickcontrols/qquickstyle/data/CmdLineArgStyle/qmldir
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/Custom/Label.qml b/tests/auto/quickcontrols/qquickstyle/data/Custom/Label.qml
index 744dcd8f08..744dcd8f08 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/Custom/Label.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/Custom/Label.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/Custom/qmldir b/tests/auto/quickcontrols/qquickstyle/data/Custom/qmldir
index 08de6fa804..08de6fa804 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/Custom/qmldir
+++ b/tests/auto/quickcontrols/qquickstyle/data/Custom/qmldir
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/Control.qml b/tests/auto/quickcontrols/qquickstyle/data/EnvVarFallbackStyle/Control.qml
index 744dcd8f08..744dcd8f08 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/Control.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/EnvVarFallbackStyle/Control.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/qmldir b/tests/auto/quickcontrols/qquickstyle/data/EnvVarFallbackStyle/qmldir
index bebd8e07c6..bebd8e07c6 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/qmldir
+++ b/tests/auto/quickcontrols/qquickstyle/data/EnvVarFallbackStyle/qmldir
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/Control.qml b/tests/auto/quickcontrols/qquickstyle/data/EnvVarStyle/Control.qml
index 744dcd8f08..744dcd8f08 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/Control.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/EnvVarStyle/Control.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/qmldir b/tests/auto/quickcontrols/qquickstyle/data/EnvVarStyle/qmldir
index 42223a1930..42223a1930 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/qmldir
+++ b/tests/auto/quickcontrols/qquickstyle/data/EnvVarStyle/qmldir
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/basic.conf b/tests/auto/quickcontrols/qquickstyle/data/basic.conf
index 17ef59ee02..17ef59ee02 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/basic.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/basic.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/custom.conf b/tests/auto/quickcontrols/qquickstyle/data/custom.conf
index ac79338ce5..ac79338ce5 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/custom.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/custom.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/dependencies.qml b/tests/auto/quickcontrols/qquickstyle/data/dependencies.qml
index 280cfd2962..280cfd2962 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/dependencies.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/dependencies.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/designer/ButtonSpecifics.qml b/tests/auto/quickcontrols/qquickstyle/data/designer/ButtonSpecifics.qml
index 21226ed2a7..21226ed2a7 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/designer/ButtonSpecifics.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/designer/ButtonSpecifics.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/dummy.dSYM/empty b/tests/auto/quickcontrols/qquickstyle/data/dummy.dSYM/empty
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/dummy.dSYM/empty
+++ b/tests/auto/quickcontrols/qquickstyle/data/dummy.dSYM/empty
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/dummyStyles/DummyStyle/Button.qml b/tests/auto/quickcontrols/qquickstyle/data/dummyStyles/DummyStyle/Button.qml
index dcacc01140..dcacc01140 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/dummyStyles/DummyStyle/Button.qml
+++ b/tests/auto/quickcontrols/qquickstyle/data/dummyStyles/DummyStyle/Button.qml
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/fusion.conf b/tests/auto/quickcontrols/qquickstyle/data/fusion.conf
index 1f343e656f..1f343e656f 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/fusion.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/fusion.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/imagine.conf b/tests/auto/quickcontrols/qquickstyle/data/imagine.conf
index 919bbcf09e..919bbcf09e 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/imagine.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/imagine.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/material.conf b/tests/auto/quickcontrols/qquickstyle/data/material.conf
index 27c7931a92..27c7931a92 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/material.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/material.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/data/universal.conf b/tests/auto/quickcontrols/qquickstyle/data/universal.conf
index a5ac3ca3f0..a5ac3ca3f0 100644
--- a/tests/auto/quickcontrols2/qquickstyle/data/universal.conf
+++ b/tests/auto/quickcontrols/qquickstyle/data/universal.conf
diff --git a/tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle.cpp b/tests/auto/quickcontrols/qquickstyle/tst_qquickstyle.cpp
index e7572164b8..e7572164b8 100644
--- a/tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle.cpp
+++ b/tests/auto/quickcontrols/qquickstyle/tst_qquickstyle.cpp
diff --git a/tests/auto/quickcontrols2/qquicktextarea/CMakeLists.txt b/tests/auto/quickcontrols/qquicktextarea/CMakeLists.txt
index 85c5677f72..01518834f1 100644
--- a/tests/auto/quickcontrols2/qquicktextarea/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquicktextarea/CMakeLists.txt
@@ -21,7 +21,7 @@ qt_internal_add_test(tst_qquicktextarea
     SOURCES
         tst_qquicktextarea.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_default.qml b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_default.qml
index cb51b80545..cb51b80545 100644
--- a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_default.qml
+++ b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_default.qml
diff --git a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_old_default.qml b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_old_default.qml
index 1401be36c1..1401be36c1 100644
--- a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_old_default.qml
+++ b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_old_default.qml
diff --git a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_old_overridden.qml b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_old_overridden.qml
index c0e6fb60a8..c0e6fb60a8 100644
--- a/tests/auto/quickcontrols2/qquicktextarea/data/mouseselection_old_overridden.qml
+++ b/tests/auto/quickcontrols/qquicktextarea/data/mouseselection_old_overridden.qml
diff --git a/tests/auto/quickcontrols2/qquicktextarea/data/twoInAColumn.qml b/tests/auto/quickcontrols/qquicktextarea/data/twoInAColumn.qml
index 944f5598ac..944f5598ac 100644
--- a/tests/auto/quickcontrols2/qquicktextarea/data/twoInAColumn.qml
+++ b/tests/auto/quickcontrols/qquicktextarea/data/twoInAColumn.qml
diff --git a/tests/auto/quickcontrols2/qquicktextarea/tst_qquicktextarea.cpp b/tests/auto/quickcontrols/qquicktextarea/tst_qquicktextarea.cpp
index 1c40b078f7..1c40b078f7 100644
--- a/tests/auto/quickcontrols2/qquicktextarea/tst_qquicktextarea.cpp
+++ b/tests/auto/quickcontrols/qquicktextarea/tst_qquicktextarea.cpp
diff --git a/tests/auto/quickcontrols2/qquicktextfield/CMakeLists.txt b/tests/auto/quickcontrols/qquicktextfield/CMakeLists.txt
index d2576f28aa..2377010e0e 100644
--- a/tests/auto/quickcontrols2/qquicktextfield/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquicktextfield/CMakeLists.txt
@@ -21,7 +21,7 @@ qt_internal_add_test(tst_qquicktextfield
     SOURCES
         tst_qquicktextfield.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_default.qml b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_default.qml
index 2bcaf2abd4..2bcaf2abd4 100644
--- a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_default.qml
+++ b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_default.qml
diff --git a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_old_default.qml b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_old_default.qml
index 0eb774a322..0eb774a322 100644
--- a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_old_default.qml
+++ b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_old_default.qml
diff --git a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_old_overridden.qml b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_old_overridden.qml
index 0e357e032f..0e357e032f 100644
--- a/tests/auto/quickcontrols2/qquicktextfield/data/mouseselection_old_overridden.qml
+++ b/tests/auto/quickcontrols/qquicktextfield/data/mouseselection_old_overridden.qml
diff --git a/tests/auto/quickcontrols2/qquicktextfield/tst_qquicktextfield.cpp b/tests/auto/quickcontrols/qquicktextfield/tst_qquicktextfield.cpp
index 19219bb79e..19219bb79e 100644
--- a/tests/auto/quickcontrols2/qquicktextfield/tst_qquicktextfield.cpp
+++ b/tests/auto/quickcontrols/qquicktextfield/tst_qquicktextfield.cpp
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/BLACKLIST b/tests/auto/quickcontrols/qquicktreeviewdelegate/BLACKLIST
index ed6d7fd2cf..ed6d7fd2cf 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/BLACKLIST
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/BLACKLIST
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/CMakeLists.txt b/tests/auto/quickcontrols/qquicktreeviewdelegate/CMakeLists.txt
index 63f06f0564..63f06f0564 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/data/unmodified.qml b/tests/auto/quickcontrols/qquicktreeviewdelegate/data/unmodified.qml
index c3edb37d1c..c3edb37d1c 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/data/unmodified.qml
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/data/unmodified.qml
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/testmodel.cpp b/tests/auto/quickcontrols/qquicktreeviewdelegate/testmodel.cpp
index 6c6da8452b..6c6da8452b 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/testmodel.cpp
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/testmodel.cpp
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/testmodel.h b/tests/auto/quickcontrols/qquicktreeviewdelegate/testmodel.h
index f886c56d4a..f886c56d4a 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/testmodel.h
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/testmodel.h
diff --git a/tests/auto/quickcontrols2/qquicktreeviewdelegate/tst_qquicktreeviewdelegate.cpp b/tests/auto/quickcontrols/qquicktreeviewdelegate/tst_qquicktreeviewdelegate.cpp
index 834729e133..834729e133 100644
--- a/tests/auto/quickcontrols2/qquicktreeviewdelegate/tst_qquicktreeviewdelegate.cpp
+++ b/tests/auto/quickcontrols/qquicktreeviewdelegate/tst_qquicktreeviewdelegate.cpp
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/CMakeLists.txt b/tests/auto/quickcontrols/qquickuniversalstyle/CMakeLists.txt
index a7f8ebfd6f..a7f8ebfd6f 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickuniversalstyle/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/data/tst_universal.qml b/tests/auto/quickcontrols/qquickuniversalstyle/data/tst_universal.qml
index 2ce0cadb38..2ce0cadb38 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/data/tst_universal.qml
+++ b/tests/auto/quickcontrols/qquickuniversalstyle/data/tst_universal.qml
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickuniversalstyle/qtquickcontrols2.conf
index 8c6dd807e3..8c6dd807e3 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickuniversalstyle/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle.cpp b/tests/auto/quickcontrols/qquickuniversalstyle/tst_qquickuniversalstyle.cpp
index 1d2d6332f7..1d2d6332f7 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle.cpp
+++ b/tests/auto/quickcontrols/qquickuniversalstyle/tst_qquickuniversalstyle.cpp
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/quickcontrols/qquickuniversalstyleconf/CMakeLists.txt
index 44a3c5d704..57a946b818 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt
+++ b/tests/auto/quickcontrols/qquickuniversalstyleconf/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_qquickuniversalstyleconf
     SOURCES
         tst_qquickuniversalstyleconf.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/data/applicationwindow.qml b/tests/auto/quickcontrols/qquickuniversalstyleconf/data/applicationwindow.qml
index acbccdeab0..acbccdeab0 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/data/applicationwindow.qml
+++ b/tests/auto/quickcontrols/qquickuniversalstyleconf/data/applicationwindow.qml
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickuniversalstyleconf/qtquickcontrols2.conf
index 0ec1325871..0ec1325871 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickuniversalstyleconf/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp b/tests/auto/quickcontrols/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp
index b75668fb66..b75668fb66 100644
--- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp
+++ b/tests/auto/quickcontrols/qquickuniversalstyleconf/tst_qquickuniversalstyleconf.cpp
diff --git a/tests/auto/quickcontrols2/revisions/CMakeLists.txt b/tests/auto/quickcontrols/revisions/CMakeLists.txt
index 8c51f85d20..8c51f85d20 100644
--- a/tests/auto/quickcontrols2/revisions/CMakeLists.txt
+++ b/tests/auto/quickcontrols/revisions/CMakeLists.txt
diff --git a/tests/auto/quickcontrols2/revisions/data/dependencies.qml b/tests/auto/quickcontrols/revisions/data/dependencies.qml
index bb95421995..bb95421995 100644
--- a/tests/auto/quickcontrols2/revisions/data/dependencies.qml
+++ b/tests/auto/quickcontrols/revisions/data/dependencies.qml
diff --git a/tests/auto/quickcontrols2/revisions/tst_revisions.cpp b/tests/auto/quickcontrols/revisions/tst_revisions.cpp
index 51f0f02aae..51f0f02aae 100644
--- a/tests/auto/quickcontrols2/revisions/tst_revisions.cpp
+++ b/tests/auto/quickcontrols/revisions/tst_revisions.cpp
diff --git a/tests/auto/quickcontrols2/sanity/CMakeLists.txt b/tests/auto/quickcontrols/sanity/CMakeLists.txt
index 4cac9d5f30..b279f71919 100644
--- a/tests/auto/quickcontrols2/sanity/CMakeLists.txt
+++ b/tests/auto/quickcontrols/sanity/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_sanity
     SOURCES
         tst_sanity.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/sanity/data/dependencies.qml b/tests/auto/quickcontrols/sanity/data/dependencies.qml
index 280cfd2962..280cfd2962 100644
--- a/tests/auto/quickcontrols2/sanity/data/dependencies.qml
+++ b/tests/auto/quickcontrols/sanity/data/dependencies.qml
diff --git a/tests/auto/quickcontrols2/sanity/tst_sanity.cpp b/tests/auto/quickcontrols/sanity/tst_sanity.cpp
index 150d38b5aa..150d38b5aa 100644
--- a/tests/auto/quickcontrols2/sanity/tst_sanity.cpp
+++ b/tests/auto/quickcontrols/sanity/tst_sanity.cpp
diff --git a/tests/auto/quickcontrols2/snippets/CMakeLists.txt b/tests/auto/quickcontrols/snippets/CMakeLists.txt
index 95047f8141..adad1e69c5 100644
--- a/tests/auto/quickcontrols2/snippets/CMakeLists.txt
+++ b/tests/auto/quickcontrols/snippets/CMakeLists.txt
@@ -19,13 +19,13 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
 list(APPEND test_data ${test_data_glob})
 
-set(SNIPPETS_PATH \\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2/doc/snippets\\\")
+set(SNIPPETS_PATH \\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols/doc/snippets\\\")
 
 if(WEBOS)
     # Collect snippets for webOS
     file(GLOB_RECURSE test_snippets_glob
         RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2/doc/snippets/*)
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols/doc/snippets/*)
     list(APPEND test_snippets ${test_snippets_glob})
 
     # Copy snippets to a location which is included in the webOS emulator image
diff --git a/tests/auto/quickcontrols2/snippets/data/dependencies.qml b/tests/auto/quickcontrols/snippets/data/dependencies.qml
index 8785d0b08e..8785d0b08e 100644
--- a/tests/auto/quickcontrols2/snippets/data/dependencies.qml
+++ b/tests/auto/quickcontrols/snippets/data/dependencies.qml
diff --git a/tests/auto/quickcontrols2/snippets/qtquickcontrols2.conf b/tests/auto/quickcontrols/snippets/qtquickcontrols2.conf
index bd15777684..bd15777684 100644
--- a/tests/auto/quickcontrols2/snippets/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/snippets/qtquickcontrols2.conf
diff --git a/tests/auto/quickcontrols2/snippets/tst_snippets.cpp b/tests/auto/quickcontrols/snippets/tst_snippets.cpp
index b16066a693..b16066a693 100644
--- a/tests/auto/quickcontrols2/snippets/tst_snippets.cpp
+++ b/tests/auto/quickcontrols/snippets/tst_snippets.cpp
diff --git a/tests/auto/quickcontrols2/styleimports/CMakeLists.txt b/tests/auto/quickcontrols/styleimports/CMakeLists.txt
index 95bf59e78d..d852024e0c 100644
--- a/tests/auto/quickcontrols2/styleimports/CMakeLists.txt
+++ b/tests/auto/quickcontrols/styleimports/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_styleimports
     SOURCES
         tst_styleimports.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/styleimports/data/+FileSystemStyle/CustomComponent.qml b/tests/auto/quickcontrols/styleimports/data/+FileSystemStyle/CustomComponent.qml
index ee5ffe1151..ee5ffe1151 100644
--- a/tests/auto/quickcontrols2/styleimports/data/+FileSystemStyle/CustomComponent.qml
+++ b/tests/auto/quickcontrols/styleimports/data/+FileSystemStyle/CustomComponent.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/CustomComponent.qml b/tests/auto/quickcontrols/styleimports/data/CustomComponent.qml
index 220630f812..220630f812 100644
--- a/tests/auto/quickcontrols2/styleimports/data/CustomComponent.qml
+++ b/tests/auto/quickcontrols/styleimports/data/CustomComponent.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/applicationWindowWithButton.qml b/tests/auto/quickcontrols/styleimports/data/applicationWindowWithButton.qml
index 512bd0bb08..512bd0bb08 100644
--- a/tests/auto/quickcontrols2/styleimports/data/applicationWindowWithButton.qml
+++ b/tests/auto/quickcontrols/styleimports/data/applicationWindowWithButton.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/customStyleSelector.qml b/tests/auto/quickcontrols/styleimports/data/customStyleSelector.qml
index a3def8b14b..a3def8b14b 100644
--- a/tests/auto/quickcontrols2/styleimports/data/customStyleSelector.qml
+++ b/tests/auto/quickcontrols/styleimports/data/customStyleSelector.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Action.qml b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Action.qml
index fcf336e983..fcf336e983 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Action.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Action.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Button.qml b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Button.qml
index a5078b14c2..a5078b14c2 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Label.qml b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Label.qml
index 3233d3646b..3233d3646b 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/Label.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/Label.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/qmldir b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/qmldir
index 5deb93b653..5deb93b653 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/FileSystemStyle/qmldir
+++ b/tests/auto/quickcontrols/styleimports/data/styles/FileSystemStyle/qmldir
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+linux/Button.qml b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+linux/Button.qml
index 15c04d7721..15c04d7721 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+linux/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+linux/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+macos/Button.qml b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+macos/Button.qml
index 6c07ec028a..6c07ec028a 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+macos/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+macos/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+windows/Button.qml b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+windows/Button.qml
index 6a94679c2b..6a94679c2b 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/+windows/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/+windows/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/Button.qml b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/Button.qml
index fce35efdf7..fce35efdf7 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/qmldir b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/qmldir
index ce2545171b..ce2545171b 100644
--- a/tests/auto/quickcontrols2/styleimports/data/styles/PlatformStyle/qmldir
+++ b/tests/auto/quickcontrols/styleimports/data/styles/PlatformStyle/qmldir
diff --git a/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/Button.qml b/tests/auto/quickcontrols/styleimports/resources/ResourceStyle/Button.qml
index 3a97e9de1f..3a97e9de1f 100644
--- a/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/Button.qml
+++ b/tests/auto/quickcontrols/styleimports/resources/ResourceStyle/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/qmldir b/tests/auto/quickcontrols/styleimports/resources/ResourceStyle/qmldir
index 4cb1a835bd..4cb1a835bd 100644
--- a/tests/auto/quickcontrols2/styleimports/resources/ResourceStyle/qmldir
+++ b/tests/auto/quickcontrols/styleimports/resources/ResourceStyle/qmldir
diff --git a/tests/auto/quickcontrols2/styleimports/tst_styleimports.cpp b/tests/auto/quickcontrols/styleimports/tst_styleimports.cpp
index e2bb80fb4e..e2bb80fb4e 100644
--- a/tests/auto/quickcontrols2/styleimports/tst_styleimports.cpp
+++ b/tests/auto/quickcontrols/styleimports/tst_styleimports.cpp
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimematerial/CMakeLists.txt b/tests/auto/quickcontrols/styleimportscompiletimematerial/CMakeLists.txt
index e53b4fef92..6ad1aa865e 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimematerial/CMakeLists.txt
+++ b/tests/auto/quickcontrols/styleimportscompiletimematerial/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_styleimportscompiletimematerial
     SOURCES
         tst_styleimportscompiletimematerial.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml b/tests/auto/quickcontrols/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml
index 2c8a8dadfd..2c8a8dadfd 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml
+++ b/tests/auto/quickcontrols/styleimportscompiletimematerial/data/importMaterialStyleWithoutControls.qml
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp b/tests/auto/quickcontrols/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp
index dc582ea6c2..dc582ea6c2 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp
+++ b/tests/auto/quickcontrols/styleimportscompiletimematerial/tst_styleimportscompiletimematerial.cpp
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/CMakeLists.txt b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/CMakeLists.txt
index 157921d259..fb9ba22659 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/CMakeLists.txt
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_styleimportscompiletimeqmlonly
     SOURCES
         tst_styleimportscompiletimeqmlonly.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml
index 16b83c93d3..16b83c93d3 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/QmlOnly/Button.qml
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir
index 5e60f09534..5e60f09534 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/QmlOnly/qmldir
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml
index 4d0492232c..4d0492232c 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/data/importQmlOnlyStyleWithoutControls.qml
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/dummy_imports.qml b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/dummy_imports.qml
index aa37fd14b0..aa37fd14b0 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/dummy_imports.qml
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/dummy_imports.qml
diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp
index ec5d51f846..ec5d51f846 100644
--- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp
+++ b/tests/auto/quickcontrols/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp
diff --git a/tests/auto/quickcontrols2/translation/CMakeLists.txt b/tests/auto/quickcontrols/translation/CMakeLists.txt
index 245ac65087..c1c47e139d 100644
--- a/tests/auto/quickcontrols2/translation/CMakeLists.txt
+++ b/tests/auto/quickcontrols/translation/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_internal_add_test(tst_translation
     SOURCES
         tst_translation.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickcontrols2/translation/data/comboBox.qml b/tests/auto/quickcontrols/translation/data/comboBox.qml
index e6a58787ae..e6a58787ae 100644
--- a/tests/auto/quickcontrols2/translation/data/comboBox.qml
+++ b/tests/auto/quickcontrols/translation/data/comboBox.qml
diff --git a/tests/auto/quickcontrols2/translation/data/dialogButtonBox.qml b/tests/auto/quickcontrols/translation/data/dialogButtonBox.qml
index ababa65019..ababa65019 100644
--- a/tests/auto/quickcontrols2/translation/data/dialogButtonBox.qml
+++ b/tests/auto/quickcontrols/translation/data/dialogButtonBox.qml
diff --git a/tests/auto/quickcontrols2/translation/data/dialogButtonBoxWithCustomButtons.qml b/tests/auto/quickcontrols/translation/data/dialogButtonBoxWithCustomButtons.qml
index 6e8dca8ad5..6e8dca8ad5 100644
--- a/tests/auto/quickcontrols2/translation/data/dialogButtonBoxWithCustomButtons.qml
+++ b/tests/auto/quickcontrols/translation/data/dialogButtonBoxWithCustomButtons.qml
diff --git a/tests/auto/quickcontrols2/translation/data/stackView.qml b/tests/auto/quickcontrols/translation/data/stackView.qml
index 44d85c2ea1..44d85c2ea1 100644
--- a/tests/auto/quickcontrols2/translation/data/stackView.qml
+++ b/tests/auto/quickcontrols/translation/data/stackView.qml
diff --git a/tests/auto/quickcontrols2/translation/qml_jp.qm b/tests/auto/quickcontrols/translation/qml_jp.qm
index a3712e9964..a3712e9964 100644
--- a/tests/auto/quickcontrols2/translation/qml_jp.qm
+++ b/tests/auto/quickcontrols/translation/qml_jp.qm
diff --git a/tests/auto/quickcontrols2/translation/qml_jp.ts b/tests/auto/quickcontrols/translation/qml_jp.ts
index 303c142fd8..303c142fd8 100644
--- a/tests/auto/quickcontrols2/translation/qml_jp.ts
+++ b/tests/auto/quickcontrols/translation/qml_jp.ts
diff --git a/tests/auto/quickcontrols2/translation/qtbase_fr.qm b/tests/auto/quickcontrols/translation/qtbase_fr.qm
index 176675a820..176675a820 100644
--- a/tests/auto/quickcontrols2/translation/qtbase_fr.qm
+++ b/tests/auto/quickcontrols/translation/qtbase_fr.qm
diff --git a/tests/auto/quickcontrols2/translation/qtbase_fr.ts b/tests/auto/quickcontrols/translation/qtbase_fr.ts
index 7aff8bd760..7aff8bd760 100644
--- a/tests/auto/quickcontrols2/translation/qtbase_fr.ts
+++ b/tests/auto/quickcontrols/translation/qtbase_fr.ts
diff --git a/tests/auto/quickcontrols2/translation/tst_translation.cpp b/tests/auto/quickcontrols/translation/tst_translation.cpp
index f0798d0367..f0798d0367 100644
--- a/tests/auto/quickcontrols2/translation/tst_translation.cpp
+++ b/tests/auto/quickcontrols/translation/tst_translation.cpp
diff --git a/tests/auto/quickdialogs/qquickcolordialogimpl/CMakeLists.txt b/tests/auto/quickdialogs/qquickcolordialogimpl/CMakeLists.txt
index 09a8d46990..8f52753386 100644
--- a/tests/auto/quickdialogs/qquickcolordialogimpl/CMakeLists.txt
+++ b/tests/auto/quickdialogs/qquickcolordialogimpl/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickcolordialogimpl
     SOURCES
         tst_qquickcolordialogimpl.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickdialogs/qquickfiledialogimpl/CMakeLists.txt b/tests/auto/quickdialogs/qquickfiledialogimpl/CMakeLists.txt
index 179d58ddde..7c4ef0c350 100644
--- a/tests/auto/quickdialogs/qquickfiledialogimpl/CMakeLists.txt
+++ b/tests/auto/quickdialogs/qquickfiledialogimpl/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickfiledialogimpl
     SOURCES
         tst_qquickfiledialogimpl.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickdialogs/qquickfolderdialogimpl/CMakeLists.txt b/tests/auto/quickdialogs/qquickfolderdialogimpl/CMakeLists.txt
index ea43ac7e6b..2ceb13b2c7 100644
--- a/tests/auto/quickdialogs/qquickfolderdialogimpl/CMakeLists.txt
+++ b/tests/auto/quickdialogs/qquickfolderdialogimpl/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickfolderdialogimpl
     SOURCES
         tst_qquickfolderdialogimpl.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickdialogs/qquickfontdialogimpl/CMakeLists.txt b/tests/auto/quickdialogs/qquickfontdialogimpl/CMakeLists.txt
index 378496905c..eca77db7db 100644
--- a/tests/auto/quickdialogs/qquickfontdialogimpl/CMakeLists.txt
+++ b/tests/auto/quickdialogs/qquickfontdialogimpl/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickfontdialogimpl
     SOURCES
         tst_qquickfontdialogimpl.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/auto/quickdialogs/qquickmessagedialogimpl/CMakeLists.txt b/tests/auto/quickdialogs/qquickmessagedialogimpl/CMakeLists.txt
index 976ad1fbb6..f1f75500c7 100644
--- a/tests/auto/quickdialogs/qquickmessagedialogimpl/CMakeLists.txt
+++ b/tests/auto/quickdialogs/qquickmessagedialogimpl/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickmessagedialogimpl
     SOURCES
         tst_qquickmessagedialogimpl.cpp
     DEFINES
-        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\"
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols\\\"
     LIBRARIES
         Qt::CorePrivate
         Qt::Gui