Move Default style out into its own plugin

In upcoming patches, we start registering C++ types declaratively.
A condition of doing so requires that each .pro corresponds to one
QML module. This conflicts with the QtQuick.Controls import, which
currently does quite a lot:

- Registers (and selects) QML files for the style that was set
- Registers private C++ utility types (such as IconLabel) that are
  useful for all styles under the QtQuick.Controls.impl import
- Registers private C++ types that are only useful for the Default
  style (such as BusyIndicatorImpl).

The reason it does so much can probably be explained by the
intended usage of Qt Quick Controls 2; when you do

    import QtQuick.Controls 2.0

you get access to the QML types (e.g. Button) that the style
you're using provides. So if you're using the Material style,
you'll get a Material style button. API-wise, the button is
identical to any other button, because the types in
QtQuick.Templates are what we advertise as the public API.

If we didn't have this functionality, users would need to
import specific style imports to use controls, and the
convenience of being able to simply start the application
with a different style by e.g. passing an application argument
would be lost.

To support declarative registration of types while also supporting
the existing use cases, we split out the Default-style-specific
stuff into a QtQuick.Controls.Default import.

Task-number: QTBUG-82922
Change-Id: Ib4f1620cae78d7acdc13d9ac0752a020bc22f3ea
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

118 files changed, 187 insertions, 99 deletions

diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index 66373d55..9440c36f 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -7,22 +7,14 @@ QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
-include(controls.pri)
-
 OTHER_FILES += \
-    qmldir \
-    $$QML_FILES
+    qmldir
 
 SOURCES += \
     $$PWD/qtquickcontrols2plugin.cpp
 
-RESOURCES += \
-    $$PWD/qtquickcontrols2plugin.qrc
-
 qtConfig(quick-designer): include(designer/designer.pri)
 include(doc/doc.pri)
 
-CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler
+CONFIG += no_cxx_module
 load(qml_plugin)
-
-requires(qtConfig(quickcontrols2-default))
diff --git a/src/imports/controls/AbstractButton.qml b/src/imports/controls/default/AbstractButton.qml
index 50ddb933..50ddb933 100644
--- a/src/imports/controls/AbstractButton.qml
+++ b/src/imports/controls/default/AbstractButton.qml
diff --git a/src/imports/controls/Action.qml b/src/imports/controls/default/Action.qml
index 996e9086..996e9086 100644
--- a/src/imports/controls/Action.qml
+++ b/src/imports/controls/default/Action.qml
diff --git a/src/imports/controls/ActionGroup.qml b/src/imports/controls/default/ActionGroup.qml
index 89e72c8f..89e72c8f 100644
--- a/src/imports/controls/ActionGroup.qml
+++ b/src/imports/controls/default/ActionGroup.qml
diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/default/ApplicationWindow.qml
index 235ebf13..235ebf13 100644
--- a/src/imports/controls/ApplicationWindow.qml
+++ b/src/imports/controls/default/ApplicationWindow.qml
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/default/BusyIndicator.qml
index ff5c191c..ff5c191c 100644
--- a/src/imports/controls/BusyIndicator.qml
+++ b/src/imports/controls/default/BusyIndicator.qml
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/default/Button.qml
index a9e7fce6..a9e7fce6 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/default/Button.qml
diff --git a/src/imports/controls/ButtonGroup.qml b/src/imports/controls/default/ButtonGroup.qml
index cf0355ba..cf0355ba 100644
--- a/src/imports/controls/ButtonGroup.qml
+++ b/src/imports/controls/default/ButtonGroup.qml
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/default/CheckBox.qml
index b1f50ed1..3a7c3a06 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/default/CheckBox.qml
@@ -68,7 +68,7 @@ T.CheckBox {
             y: (parent.height - height) / 2
             defaultColor: "#353637"
             color: control.palette.text
-            source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+            source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
             visible: control.checkState === Qt.Checked
         }
 
diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/default/CheckDelegate.qml
index 71b390ac..4dec9b98 100644
--- a/src/imports/controls/CheckDelegate.qml
+++ b/src/imports/controls/default/CheckDelegate.qml
@@ -87,7 +87,7 @@ T.CheckDelegate {
             y: (parent.height - height) / 2
             defaultColor: "#353637"
             color: control.palette.text
-            source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+            source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
             visible: control.checkState === Qt.Checked
         }
 
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/default/ComboBox.qml
index e9f93d66..2c36aac6 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/default/ComboBox.qml
@@ -67,7 +67,7 @@ T.ComboBox {
         y: control.topPadding + (control.availableHeight - height) / 2
         color: control.palette.dark
         defaultColor: "#353637"
-        source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/double-arrow.png"
+        source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/double-arrow.png"
         opacity: enabled ? 1 : 0.3
     }
 
diff --git a/src/imports/controls/Container.qml b/src/imports/controls/default/Container.qml
index 83ab957d..83ab957d 100644
--- a/src/imports/controls/Container.qml
+++ b/src/imports/controls/default/Container.qml
diff --git a/src/imports/controls/Control.qml b/src/imports/controls/default/Control.qml
index a963a563..a963a563 100644
--- a/src/imports/controls/Control.qml
+++ b/src/imports/controls/default/Control.qml
diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/default/DelayButton.qml
index 1c545a71..1c545a71 100644
--- a/src/imports/controls/DelayButton.qml
+++ b/src/imports/controls/default/DelayButton.qml
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/default/Dial.qml
index e7c732cd..457016d3 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/default/Dial.qml
@@ -62,7 +62,7 @@ T.Dial {
         height: 10
         defaultColor: "#353637"
         color: control.visualFocus ? control.palette.highlight : control.palette.dark
-        source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/dial-indicator.png"
+        source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/dial-indicator.png"
         antialiasing: true
         opacity: control.enabled ? 1 : 0.3
         transform: [
diff --git a/src/imports/controls/Dialog.qml b/src/imports/controls/default/Dialog.qml
index 6c2e4b1b..6c2e4b1b 100644
--- a/src/imports/controls/Dialog.qml
+++ b/src/imports/controls/default/Dialog.qml
diff --git a/src/imports/controls/DialogButtonBox.qml b/src/imports/controls/default/DialogButtonBox.qml
index 3c9d5b48..3c9d5b48 100644
--- a/src/imports/controls/DialogButtonBox.qml
+++ b/src/imports/controls/default/DialogButtonBox.qml
diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/default/Drawer.qml
index 17465fd4..17465fd4 100644
--- a/src/imports/controls/Drawer.qml
+++ b/src/imports/controls/default/Drawer.qml
diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/default/Frame.qml
index 2fe46104..2fe46104 100644
--- a/src/imports/controls/Frame.qml
+++ b/src/imports/controls/default/Frame.qml
diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/default/GroupBox.qml
index 96f776f2..96f776f2 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/default/GroupBox.qml
diff --git a/src/imports/controls/HorizontalHeaderView.qml b/src/imports/controls/default/HorizontalHeaderView.qml
index ec91af25..ec91af25 100644
--- a/src/imports/controls/HorizontalHeaderView.qml
+++ b/src/imports/controls/default/HorizontalHeaderView.qml
diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/default/ItemDelegate.qml
index 6229e2bb..6229e2bb 100644
--- a/src/imports/controls/ItemDelegate.qml
+++ b/src/imports/controls/default/ItemDelegate.qml
diff --git a/src/imports/controls/Label.qml b/src/imports/controls/default/Label.qml
index 9a42635f..9a42635f 100644
--- a/src/imports/controls/Label.qml
+++ b/src/imports/controls/default/Label.qml
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/default/Menu.qml
index cf3a52f2..cf3a52f2 100644
--- a/src/imports/controls/Menu.qml
+++ b/src/imports/controls/default/Menu.qml
diff --git a/src/imports/controls/MenuBar.qml b/src/imports/controls/default/MenuBar.qml
index 122cdc53..122cdc53 100644
--- a/src/imports/controls/MenuBar.qml
+++ b/src/imports/controls/default/MenuBar.qml
diff --git a/src/imports/controls/MenuBarItem.qml b/src/imports/controls/default/MenuBarItem.qml
index f6835412..f6835412 100644
--- a/src/imports/controls/MenuBarItem.qml
+++ b/src/imports/controls/default/MenuBarItem.qml
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/default/MenuItem.qml
index 22cdf3ea..0632decb 100644
--- a/src/imports/controls/MenuItem.qml
+++ b/src/imports/controls/default/MenuItem.qml
@@ -77,7 +77,7 @@ T.MenuItem {
         y: control.topPadding + (control.availableHeight - height) / 2
 
         visible: control.checked
-        source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" : ""
+        source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png" : ""
         color: control.palette.windowText
         defaultColor: "#353637"
     }
@@ -88,7 +88,7 @@ T.MenuItem {
 
         visible: control.subMenu
         mirror: control.mirrored
-        source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/arrow-indicator.png" : ""
+        source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/arrow-indicator.png" : ""
         color: control.palette.windowText
         defaultColor: "#353637"
     }
diff --git a/src/imports/controls/MenuSeparator.qml b/src/imports/controls/default/MenuSeparator.qml
index cc5c2b6e..cc5c2b6e 100644
--- a/src/imports/controls/MenuSeparator.qml
+++ b/src/imports/controls/default/MenuSeparator.qml
diff --git a/src/imports/controls/Page.qml b/src/imports/controls/default/Page.qml
index 4b3cf3d2..4b3cf3d2 100644
--- a/src/imports/controls/Page.qml
+++ b/src/imports/controls/default/Page.qml
diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/default/PageIndicator.qml
index 78f9e3cf..78f9e3cf 100644
--- a/src/imports/controls/PageIndicator.qml
+++ b/src/imports/controls/default/PageIndicator.qml
diff --git a/src/imports/controls/Pane.qml b/src/imports/controls/default/Pane.qml
index 47b916e3..47b916e3 100644
--- a/src/imports/controls/Pane.qml
+++ b/src/imports/controls/default/Pane.qml
diff --git a/src/imports/controls/Popup.qml b/src/imports/controls/default/Popup.qml
index ee243c10..ee243c10 100644
--- a/src/imports/controls/Popup.qml
+++ b/src/imports/controls/default/Popup.qml
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/default/ProgressBar.qml
index 61cdea43..61cdea43 100644
--- a/src/imports/controls/ProgressBar.qml
+++ b/src/imports/controls/default/ProgressBar.qml
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/default/RadioButton.qml
index cdf0c30e..cdf0c30e 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/default/RadioButton.qml
diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/default/RadioDelegate.qml
index a7e7dec0..a7e7dec0 100644
--- a/src/imports/controls/RadioDelegate.qml
+++ b/src/imports/controls/default/RadioDelegate.qml
diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/default/RangeSlider.qml
index c3e7c964..c3e7c964 100644
--- a/src/imports/controls/RangeSlider.qml
+++ b/src/imports/controls/default/RangeSlider.qml
diff --git a/src/imports/controls/RoundButton.qml b/src/imports/controls/default/RoundButton.qml
index 825d5252..825d5252 100644
--- a/src/imports/controls/RoundButton.qml
+++ b/src/imports/controls/default/RoundButton.qml
diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/default/ScrollBar.qml
index 0948fb1d..0948fb1d 100644
--- a/src/imports/controls/ScrollBar.qml
+++ b/src/imports/controls/default/ScrollBar.qml
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/default/ScrollIndicator.qml
index 795c20ee..795c20ee 100644
--- a/src/imports/controls/ScrollIndicator.qml
+++ b/src/imports/controls/default/ScrollIndicator.qml
diff --git a/src/imports/controls/ScrollView.qml b/src/imports/controls/default/ScrollView.qml
index f775d624..f775d624 100644
--- a/src/imports/controls/ScrollView.qml
+++ b/src/imports/controls/default/ScrollView.qml
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/default/Slider.qml
index 6d532389..6d532389 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/default/Slider.qml
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/default/SpinBox.qml
index d1c2ea5b..d1c2ea5b 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/default/SpinBox.qml
diff --git a/src/imports/controls/SplitView.qml b/src/imports/controls/default/SplitView.qml
index 9d37a83e..9d37a83e 100644
--- a/src/imports/controls/SplitView.qml
+++ b/src/imports/controls/default/SplitView.qml
diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/default/StackView.qml
index 3e416b87..3e416b87 100644
--- a/src/imports/controls/StackView.qml
+++ b/src/imports/controls/default/StackView.qml
diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/default/SwipeDelegate.qml
index 37d66bb6..37d66bb6 100644
--- a/src/imports/controls/SwipeDelegate.qml
+++ b/src/imports/controls/default/SwipeDelegate.qml
diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/default/SwipeView.qml
index 7722d258..7722d258 100644
--- a/src/imports/controls/SwipeView.qml
+++ b/src/imports/controls/default/SwipeView.qml
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/default/Switch.qml
index f62e2502..f62e2502 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/default/Switch.qml
diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/default/SwitchDelegate.qml
index d6447e77..d6447e77 100644
--- a/src/imports/controls/SwitchDelegate.qml
+++ b/src/imports/controls/default/SwitchDelegate.qml
diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/default/TabBar.qml
index 83f6b3b2..83f6b3b2 100644
--- a/src/imports/controls/TabBar.qml
+++ b/src/imports/controls/default/TabBar.qml
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/default/TabButton.qml
index f8b303ea..f8b303ea 100644
--- a/src/imports/controls/TabButton.qml
+++ b/src/imports/controls/default/TabButton.qml
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/default/TextArea.qml
index 45790e67..45790e67 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/default/TextArea.qml
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/default/TextField.qml
index 4d9cb691..4d9cb691 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/default/TextField.qml
diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/default/ToolBar.qml
index 1e07b6bf..1e07b6bf 100644
--- a/src/imports/controls/ToolBar.qml
+++ b/src/imports/controls/default/ToolBar.qml
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/default/ToolButton.qml
index 63aaf893..63aaf893 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/default/ToolButton.qml
diff --git a/src/imports/controls/ToolSeparator.qml b/src/imports/controls/default/ToolSeparator.qml
index 188d0758..188d0758 100644
--- a/src/imports/controls/ToolSeparator.qml
+++ b/src/imports/controls/default/ToolSeparator.qml
diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/default/ToolTip.qml
index e0389903..e0389903 100644
--- a/src/imports/controls/ToolTip.qml
+++ b/src/imports/controls/default/ToolTip.qml
diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/default/Tumbler.qml
index 4d1abdd3..4d1abdd3 100644
--- a/src/imports/controls/Tumbler.qml
+++ b/src/imports/controls/default/Tumbler.qml
diff --git a/src/imports/controls/VerticalHeaderView.qml b/src/imports/controls/default/VerticalHeaderView.qml
index 3fc9ca5a..3fc9ca5a 100644
--- a/src/imports/controls/VerticalHeaderView.qml
+++ b/src/imports/controls/default/VerticalHeaderView.qml
diff --git a/src/imports/controls/controls.pri b/src/imports/controls/default/default.pri
index 03fc0f4b..03fc0f4b 100644
--- a/src/imports/controls/controls.pri
+++ b/src/imports/controls/default/default.pri
diff --git a/src/imports/controls/default/default.pro b/src/imports/controls/default/default.pro
new file mode 100644
index 00000000..46e46531
--- /dev/null
+++ b/src/imports/controls/default/default.pro
@@ -0,0 +1,27 @@
+TARGET = qtquickcontrols2defaultstyleplugin
+TARGETPATH = QtQuick/Controls.2/Default
+
+IMPORT_NAME = QtQuick.Controls.Default
+IMPORT_VERSION = 2.$$QT_MINOR_VERSION
+
+QT += qml quick
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
+
+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+
+include(default.pri)
+
+OTHER_FILES += \
+    qmldir \
+    $$QML_FILES
+
+SOURCES += \
+    $$PWD/qtquickcontrols2defaultstyleplugin.cpp
+
+RESOURCES += \
+    $$PWD/qtquickcontrols2defaultstyleplugin.qrc
+
+CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler
+load(qml_plugin)
+
+requires(qtConfig(quickcontrols2-default))
diff --git a/src/imports/controls/dependencies.json b/src/imports/controls/default/dependencies.json
index 78029004..78029004 100644
--- a/src/imports/controls/dependencies.json
+++ b/src/imports/controls/default/dependencies.json
diff --git a/src/imports/controls/images/arrow-indicator.png b/src/imports/controls/default/images/arrow-indicator.png
index d833d52c..d833d52c 100644
--- a/src/imports/controls/images/arrow-indicator.png
+++ b/src/imports/controls/default/images/arrow-indicator.png
diff --git a/src/imports/controls/images/arrow-indicator@2x.png b/src/imports/controls/default/images/arrow-indicator@2x.png
index 55c7940a..55c7940a 100644
--- a/src/imports/controls/images/arrow-indicator@2x.png
+++ b/src/imports/controls/default/images/arrow-indicator@2x.png
diff --git a/src/imports/controls/images/arrow-indicator@3x.png b/src/imports/controls/default/images/arrow-indicator@3x.png
index c7067c5c..c7067c5c 100644
--- a/src/imports/controls/images/arrow-indicator@3x.png
+++ b/src/imports/controls/default/images/arrow-indicator@3x.png
diff --git a/src/imports/controls/images/arrow-indicator@4x.png b/src/imports/controls/default/images/arrow-indicator@4x.png
index 4c5cf351..4c5cf351 100644
--- a/src/imports/controls/images/arrow-indicator@4x.png
+++ b/src/imports/controls/default/images/arrow-indicator@4x.png
diff --git a/src/imports/controls/images/check.png b/src/imports/controls/default/images/check.png
index 479a8442..479a8442 100644
--- a/src/imports/controls/images/check.png
+++ b/src/imports/controls/default/images/check.png
diff --git a/src/imports/controls/images/check@2x.png b/src/imports/controls/default/images/check@2x.png
index 79663c0b..79663c0b 100644
--- a/src/imports/controls/images/check@2x.png
+++ b/src/imports/controls/default/images/check@2x.png
diff --git a/src/imports/controls/images/check@3x.png b/src/imports/controls/default/images/check@3x.png
index fd0135ab..fd0135ab 100644
--- a/src/imports/controls/images/check@3x.png
+++ b/src/imports/controls/default/images/check@3x.png
diff --git a/src/imports/controls/images/check@4x.png b/src/imports/controls/default/images/check@4x.png
index e7e0b640..e7e0b640 100644
--- a/src/imports/controls/images/check@4x.png
+++ b/src/imports/controls/default/images/check@4x.png
diff --git a/src/imports/controls/images/dial-indicator.png b/src/imports/controls/default/images/dial-indicator.png
index 92357c51..92357c51 100644
--- a/src/imports/controls/images/dial-indicator.png
+++ b/src/imports/controls/default/images/dial-indicator.png
diff --git a/src/imports/controls/images/dial-indicator@2x.png b/src/imports/controls/default/images/dial-indicator@2x.png
index f436443b..f436443b 100644
--- a/src/imports/controls/images/dial-indicator@2x.png
+++ b/src/imports/controls/default/images/dial-indicator@2x.png
diff --git a/src/imports/controls/images/dial-indicator@3x.png b/src/imports/controls/default/images/dial-indicator@3x.png
index d883045b..d883045b 100644
--- a/src/imports/controls/images/dial-indicator@3x.png
+++ b/src/imports/controls/default/images/dial-indicator@3x.png
diff --git a/src/imports/controls/images/dial-indicator@4x.png b/src/imports/controls/default/images/dial-indicator@4x.png
index 79477712..79477712 100644
--- a/src/imports/controls/images/dial-indicator@4x.png
+++ b/src/imports/controls/default/images/dial-indicator@4x.png
diff --git a/src/imports/controls/images/double-arrow.png b/src/imports/controls/default/images/double-arrow.png
index 3ecd7f89..3ecd7f89 100644
--- a/src/imports/controls/images/double-arrow.png
+++ b/src/imports/controls/default/images/double-arrow.png
diff --git a/src/imports/controls/images/double-arrow@2x.png b/src/imports/controls/default/images/double-arrow@2x.png
index eeb03e28..eeb03e28 100644
--- a/src/imports/controls/images/double-arrow@2x.png
+++ b/src/imports/controls/default/images/double-arrow@2x.png
diff --git a/src/imports/controls/images/double-arrow@3x.png b/src/imports/controls/default/images/double-arrow@3x.png
index f0662d20..f0662d20 100644
--- a/src/imports/controls/images/double-arrow@3x.png
+++ b/src/imports/controls/default/images/double-arrow@3x.png
diff --git a/src/imports/controls/images/double-arrow@4x.png b/src/imports/controls/default/images/double-arrow@4x.png
index 10891e91..10891e91 100644
--- a/src/imports/controls/images/double-arrow@4x.png
+++ b/src/imports/controls/default/images/double-arrow@4x.png
diff --git a/src/imports/controls/images/drop-indicator.png b/src/imports/controls/default/images/drop-indicator.png
index 80c1d958..80c1d958 100644
--- a/src/imports/controls/images/drop-indicator.png
+++ b/src/imports/controls/default/images/drop-indicator.png
diff --git a/src/imports/controls/images/drop-indicator@2x.png b/src/imports/controls/default/images/drop-indicator@2x.png
index 6e0f228c..6e0f228c 100644
--- a/src/imports/controls/images/drop-indicator@2x.png
+++ b/src/imports/controls/default/images/drop-indicator@2x.png
diff --git a/src/imports/controls/images/drop-indicator@3x.png b/src/imports/controls/default/images/drop-indicator@3x.png
index 199752fb..199752fb 100644
--- a/src/imports/controls/images/drop-indicator@3x.png
+++ b/src/imports/controls/default/images/drop-indicator@3x.png
diff --git a/src/imports/controls/images/drop-indicator@4x.png b/src/imports/controls/default/images/drop-indicator@4x.png
index 58311fbe..58311fbe 100644
--- a/src/imports/controls/images/drop-indicator@4x.png
+++ b/src/imports/controls/default/images/drop-indicator@4x.png
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/default/plugins.qmltypes
index e8212c55..e8212c55 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/default/plugins.qmltypes
diff --git a/src/imports/controls/default/qmldir b/src/imports/controls/default/qmldir
new file mode 100644
index 00000000..69b219aa
--- /dev/null
+++ b/src/imports/controls/default/qmldir
@@ -0,0 +1,4 @@
+module QtQuick.Controls.Default
+plugin qtquickcontrols2defaultstyleplugin
+classname QtQuickControls2DefaultStylePlugin
+depends QtQuick.Controls 2.5
diff --git a/src/imports/controls/qquickdefaultbusyindicator.cpp b/src/imports/controls/default/qquickdefaultbusyindicator.cpp
index aca795d9..aca795d9 100644
--- a/src/imports/controls/qquickdefaultbusyindicator.cpp
+++ b/src/imports/controls/default/qquickdefaultbusyindicator.cpp
diff --git a/src/imports/controls/qquickdefaultbusyindicator_p.h b/src/imports/controls/default/qquickdefaultbusyindicator_p.h
index eedaf09a..eedaf09a 100644
--- a/src/imports/controls/qquickdefaultbusyindicator_p.h
+++ b/src/imports/controls/default/qquickdefaultbusyindicator_p.h
diff --git a/src/imports/controls/qquickdefaultdial.cpp b/src/imports/controls/default/qquickdefaultdial.cpp
index 1653def7..1653def7 100644
--- a/src/imports/controls/qquickdefaultdial.cpp
+++ b/src/imports/controls/default/qquickdefaultdial.cpp
diff --git a/src/imports/controls/qquickdefaultdial_p.h b/src/imports/controls/default/qquickdefaultdial_p.h
index 73e14321..73e14321 100644
--- a/src/imports/controls/qquickdefaultdial_p.h
+++ b/src/imports/controls/default/qquickdefaultdial_p.h
diff --git a/src/imports/controls/qquickdefaultprogressbar.cpp b/src/imports/controls/default/qquickdefaultprogressbar.cpp
index f44065e4..f44065e4 100644
--- a/src/imports/controls/qquickdefaultprogressbar.cpp
+++ b/src/imports/controls/default/qquickdefaultprogressbar.cpp
diff --git a/src/imports/controls/qquickdefaultprogressbar_p.h b/src/imports/controls/default/qquickdefaultprogressbar_p.h
index 241d0b3b..241d0b3b 100644
--- a/src/imports/controls/qquickdefaultprogressbar_p.h
+++ b/src/imports/controls/default/qquickdefaultprogressbar_p.h
diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/default/qquickdefaultstyle.cpp
index 15c59798..15c59798 100644
--- a/src/imports/controls/qquickdefaultstyle.cpp
+++ b/src/imports/controls/default/qquickdefaultstyle.cpp
diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/default/qquickdefaultstyle_p.h
index fcd489a0..fcd489a0 100644
--- a/src/imports/controls/qquickdefaultstyle_p.h
+++ b/src/imports/controls/default/qquickdefaultstyle_p.h
diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/default/qquickdefaulttheme.cpp
index 26fb2a2f..26fb2a2f 100644
--- a/src/imports/controls/qquickdefaulttheme.cpp
+++ b/src/imports/controls/default/qquickdefaulttheme.cpp
diff --git a/src/imports/controls/qquickdefaulttheme_p.h b/src/imports/controls/default/qquickdefaulttheme_p.h
index 3a7311c7..3a7311c7 100644
--- a/src/imports/controls/qquickdefaulttheme_p.h
+++ b/src/imports/controls/default/qquickdefaulttheme_p.h
diff --git a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp
new file mode 100644
index 00000000..6e396dcf
--- /dev/null
+++ b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtQuickControls2/private/qquickstyleplugin_p.h>
+
+#include "qquickdefaultbusyindicator_p.h"
+#include "qquickdefaultdial_p.h"
+#include "qquickdefaultprogressbar_p.h"
+#include "qquickdefaultstyle_p.h"
+#include "qquickdefaulttheme_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QtQuickControls2DefaultStylePlugin: public QQuickStylePlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+
+public:
+    QtQuickControls2DefaultStylePlugin(QObject *parent = nullptr);
+
+    void registerTypes(const char *uri) override;
+
+    QString name() const override;
+    void initializeTheme(QQuickTheme *theme) override;
+};
+
+QtQuickControls2DefaultStylePlugin::QtQuickControls2DefaultStylePlugin(QObject *parent) : QQuickStylePlugin(parent)
+{
+}
+
+void QtQuickControls2DefaultStylePlugin::registerTypes(const char *uri)
+{
+    // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+    // Qt 5 release.
+    qmlRegisterModule(uri, 2, 15);
+
+    // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+    // Qt 5 release.
+    const QByteArray import = QByteArray(uri) + ".impl";
+    qmlRegisterModule(import, 2, 15);
+
+    // QtQuick.Controls.impl 2.0 (Qt 5.7)
+    qmlRegisterType<QQuickDefaultBusyIndicator>(import, 2, 0, "BusyIndicatorImpl");
+    qmlRegisterType<QQuickDefaultDial>(import, 2, 0, "DialImpl");
+    qmlRegisterType<QQuickDefaultProgressBar>(import, 2, 0, "ProgressBarImpl");
+
+    // QtQuick.Controls.impl 2.1 (Qt 5.8)
+    qmlRegisterSingletonType<QQuickDefaultStyle>(import, 2, 1, "Default", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
+            Q_UNUSED(engine);
+            Q_UNUSED(scriptEngine);
+            return new QQuickDefaultStyle;
+    });
+}
+
+QString QtQuickControls2DefaultStylePlugin::name() const
+{
+    return QStringLiteral("Default");
+}
+
+void QtQuickControls2DefaultStylePlugin::initializeTheme(QQuickTheme *theme)
+{
+    QQuickDefaultTheme::initialize(theme);
+}
+
+QT_END_NAMESPACE
+
+#include "qtquickcontrols2defaultstyleplugin.moc"
diff --git a/src/imports/controls/qtquickcontrols2plugin.qrc b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc
index c2dd9d39..eddadf2d 100644
--- a/src/imports/controls/qtquickcontrols2plugin.qrc
+++ b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/qt-project.org/imports/QtQuick/Controls.2">
+    <qresource prefix="/qt-project.org/imports/QtQuick/Controls.2/Default">
         <file>images/arrow-indicator.png</file>
         <file>images/arrow-indicator@2x.png</file>
         <file>images/arrow-indicator@3x.png</file>
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
index f6559376..a04f93cb 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
@@ -29,6 +29,6 @@ import QtQuick 2.12
 import QtQuick.Controls 2.12
 
 Button {
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
     display: Button.IconOnly
 }
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
index bc99bba7..0c1f8ef1 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
@@ -30,6 +30,6 @@ import QtQuick.Controls 2.12
 
 Button {
     text: "Button"
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
     display: Button.TextBesideIcon
 }
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index 938b8d42..5226646e 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -58,7 +58,7 @@
     \c Button.qml. This file can be found in the following path in your Qt
     installation:
 
-    \c {$QTDIR/qml/QtQuick/Controls.2/Button.qml}
+    \c {$QTDIR/qml/QtQuick/Controls.2/Default/Button.qml}
 
     After doing that, we'll simply add the following line:
 
@@ -397,7 +397,7 @@
     \endcode
 
     We then copy \c Button.qml from the Default style in
-    \c {$QTDIR/qml/QtQuick/Controls.2/} into a new \c myproject folder in our
+    \c {$QTDIR/qml/QtQuick/Controls.2/Default/} into a new \c myproject folder in our
     project directory. Add the newly copied \c Button.qml to \c qml.qrc, which is
     the resource file that contains our QML files.
 
diff --git a/src/imports/controls/qmldir b/src/imports/controls/qmldir
index c9ccb8f9..ae46e973 100644
--- a/src/imports/controls/qmldir
+++ b/src/imports/controls/qmldir
@@ -2,4 +2,5 @@ module QtQuick.Controls
 plugin qtquickcontrols2plugin
 classname QtQuickControls2Plugin
 depends QtQuick.Templates 2.5
+import QtQuick.Controls.impl auto
 designersupported
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 38fba04e..55a03c36 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -40,6 +40,8 @@
 #include <QtCore/qpluginloader.h>
 #include <QtCore/private/qfileselector_p.h>
 #include <QtQml/qqmlfile.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqmlengine.h>
 #include <QtQml/private/qqmldirparser_p.h>
 #include <QtQuickControls2/qquickstyle.h>
 #include <QtQuickControls2/private/qquickchecklabel_p.h>
@@ -56,20 +58,13 @@
 #include <QtQuickControls2/private/qquicktumblerview_p.h>
 #endif
 #include <QtQuickTemplates2/private/qquickoverlay_p.h>
-#include <QtQuickTemplates2/private/qquicksplitview_p.h>
 #include <QtQuickControls2/private/qquickclippedtext_p.h>
 #include <QtQuickControls2/private/qquickitemgroup_p.h>
 #include <QtQuickTemplates2/private/qquicktheme_p_p.h>
 
-#include "qquickdefaultbusyindicator_p.h"
-#include "qquickdefaultdial_p.h"
-#include "qquickdefaultprogressbar_p.h"
-#include "qquickdefaultstyle_p.h"
-#include "qquickdefaulttheme_p.h"
-
 QT_BEGIN_NAMESPACE
 
-class QtQuickControls2Plugin: public QQuickStylePlugin
+class QtQuickControls2Plugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
@@ -82,9 +77,6 @@ public:
     void registerTypes(const char *uri) override;
     void unregisterTypes() override;
 
-    QString name() const override;
-    void initializeTheme(QQuickTheme *theme) override;
-
 private:
     void init();
 
@@ -92,7 +84,7 @@ private:
     QQuickTheme *createTheme(const QString &name);
 };
 
-QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQuickStylePlugin(parent)
+QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQmlExtensionPlugin(parent)
 {
 }
 
@@ -102,23 +94,16 @@ QtQuickControls2Plugin::~QtQuickControls2Plugin()
     // initialization and cleanup, as plugins are not unloaded on macOS.
 }
 
-void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *uri)
+void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char */*uri*/)
 {
-    QQuickStylePlugin::initializeEngine(engine, uri);
+    engine->addUrlInterceptor(&QQuickStylePrivate::urlInterceptor);
     init();
 }
 
-static bool isDefaultStyle(const QString &style)
-{
-    return style.isEmpty() || style.compare(QStringLiteral("Default"), Qt::CaseInsensitive) == 0;
-}
-
 void QtQuickControls2Plugin::registerTypes(const char *uri)
 {
     QQuickStylePrivate::init(baseUrl());
 
-    QQuickStylePlugin::registerTypes(uri);
-
     const QString style = QQuickStyle::name();
     if (!style.isEmpty())
         QFileSelectorPrivate::addStatics(QStringList() << style.toLower());
@@ -135,20 +120,12 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
     qmlRegisterModule(import, 2, 15);
 
     // QtQuick.Controls.impl 2.0 (Qt 5.7)
-    qmlRegisterType<QQuickDefaultBusyIndicator>(import, 2, 0, "BusyIndicatorImpl");
-    qmlRegisterType<QQuickDefaultDial>(import, 2, 0, "DialImpl");
     qmlRegisterType<QQuickPaddedRectangle>(import, 2, 0, "PaddedRectangle");
-    qmlRegisterType<QQuickDefaultProgressBar>(import, 2, 0, "ProgressBarImpl");
 
     // QtQuick.Controls.impl 2.1 (Qt 5.8)
 #if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview)
     qmlRegisterType<QQuickTumblerView>(import, 2, 1, "TumblerView");
 #endif
-    qmlRegisterSingletonType<QQuickDefaultStyle>(import, 2, 1, "Default", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
-            Q_UNUSED(engine);
-            Q_UNUSED(scriptEngine);
-            return new QQuickDefaultStyle;
-    });
 
     // QtQuick.Controls.impl 2.2 (Qt 5.9)
     qmlRegisterType<QQuickClippedText>(import, 2, 2, "ClippedText");
@@ -171,26 +148,13 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
 
 void QtQuickControls2Plugin::unregisterTypes()
 {
-    QQuickStylePlugin::unregisterTypes();
     QQuickStylePrivate::reset();
 }
 
-QString QtQuickControls2Plugin::name() const
-{
-    return QStringLiteral("Default");
-}
-
-void QtQuickControls2Plugin::initializeTheme(QQuickTheme *theme)
-{
-    QQuickDefaultTheme::initialize(theme);
-}
-
 void QtQuickControls2Plugin::init()
 {
     const QString style = QQuickStyle::name();
-    QQuickTheme *theme = createTheme(style.isEmpty() ? name() : style);
-    if (isDefaultStyle(style))
-        initializeTheme(theme);
+    QQuickTheme *theme = createTheme(style.isEmpty() ? QLatin1String("Default") : style);
 
     // load the style's plugins to get access to its resources and initialize the theme
     QList<QQuickStylePlugin *> stylePlugins = loadStylePlugins();
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 2345616e..387418de 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -5,6 +5,7 @@ SUBDIRS += \
     templates
 
 SUBDIRS += \
+    controls/default/default.pro \
     controls/fusion/fusion.pro \
     controls/imagine/imagine.pro \
     controls/material/material.pro \
diff --git a/src/quickcontrols2/qquickstyleplugin.cpp b/src/quickcontrols2/qquickstyleplugin.cpp
index 067d8dff..b387b378 100644
--- a/src/quickcontrols2/qquickstyleplugin.cpp
+++ b/src/quickcontrols2/qquickstyleplugin.cpp
@@ -57,13 +57,4 @@ QString QQuickStylePlugin::name() const
     return QString();
 }
 
-void QQuickStylePlugin::initializeTheme(QQuickTheme *theme)
-{
-    Q_UNUSED(theme);
-}
-
-void QQuickStylePlugin::registerTypes(const char */*uri*/)
-{
-}
-
 QT_END_NAMESPACE
diff --git a/src/quickcontrols2/qquickstyleplugin_p.h b/src/quickcontrols2/qquickstyleplugin_p.h
index a9700c15..f5c5705c 100644
--- a/src/quickcontrols2/qquickstyleplugin_p.h
+++ b/src/quickcontrols2/qquickstyleplugin_p.h
@@ -64,7 +64,7 @@ public:
     ~QQuickStylePlugin();
 
     virtual QString name() const;
-    virtual void initializeTheme(QQuickTheme *theme);
+    virtual void initializeTheme(QQuickTheme *theme) = 0;
 
     void registerTypes(const char *uri) override;
 
diff --git a/src/quickcontrols2/quickcontrols2.pro b/src/quickcontrols2/quickcontrols2.pro
index 8aec9953..5a11dcd2 100644
--- a/src/quickcontrols2/quickcontrols2.pro
+++ b/src/quickcontrols2/quickcontrols2.pro
@@ -11,4 +11,11 @@ HEADERS += \
     $$PWD/qtquickcontrols2global_p.h
 
 include(quickcontrols2.pri)
+
+QMLTYPES_FILENAME = plugins.qmltypes
+QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Controls.2
+QML_IMPORT_NAME = QtQuick.Controls
+QML_IMPORT_VERSION = 2.15
+CONFIG += qmltypes install_qmltypes install_metatypes
+
 load(qt_module)
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 83a6ea61..22962fb3 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -467,11 +467,11 @@ TestCase {
         var control = createTemporaryObject(button, testCase, {
             text: "Button",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_checkdelegate.qml b/tests/auto/controls/data/tst_checkdelegate.qml
index 0c0565f1..74e91dfe 100644
--- a/tests/auto/controls/data/tst_checkdelegate.qml
+++ b/tests/auto/controls/data/tst_checkdelegate.qml
@@ -126,11 +126,11 @@ TestCase {
             text: "CheckDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_itemdelegate.qml b/tests/auto/controls/data/tst_itemdelegate.qml
index 1c236361..7db20b64 100644
--- a/tests/auto/controls/data/tst_itemdelegate.qml
+++ b/tests/auto/controls/data/tst_itemdelegate.qml
@@ -118,11 +118,11 @@ TestCase {
             text: "ItemDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/controls/data/tst_menuitem.qml
index ef074d1d..8f9f6014 100644
--- a/tests/auto/controls/data/tst_menuitem.qml
+++ b/tests/auto/controls/data/tst_menuitem.qml
@@ -119,11 +119,11 @@ TestCase {
         var control = createTemporaryObject(menuItem, testCase, {
             text: "MenuItem",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
 
         var padding = data.mirrored ? control.contentItem.rightPadding : control.contentItem.leftPadding
         var iconImage = findChild(control.contentItem, "image")
diff --git a/tests/auto/controls/data/tst_radiodelegate.qml b/tests/auto/controls/data/tst_radiodelegate.qml
index ff11fffb..7845fdff 100644
--- a/tests/auto/controls/data/tst_radiodelegate.qml
+++ b/tests/auto/controls/data/tst_radiodelegate.qml
@@ -126,11 +126,11 @@ TestCase {
             text: "RadioDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_roundbutton.qml b/tests/auto/controls/data/tst_roundbutton.qml
index 5f4cc5fa..57900dc4 100644
--- a/tests/auto/controls/data/tst_roundbutton.qml
+++ b/tests/auto/controls/data/tst_roundbutton.qml
@@ -122,11 +122,11 @@ TestCase {
         var control = createTemporaryObject(roundButton, testCase, {
             text: "RoundButton",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index d37ea42b..9e7a0a67 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -1672,11 +1672,11 @@ TestCase {
             text: "SwipeDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml
index 1c96023f..3bdfc83d 100644
--- a/tests/auto/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/controls/data/tst_switchdelegate.qml
@@ -560,11 +560,11 @@ TestCase {
             text: "SwitchDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/controls/data/tst_tabbutton.qml
index 96384769..7893a516 100644
--- a/tests/auto/controls/data/tst_tabbutton.qml
+++ b/tests/auto/controls/data/tst_tabbutton.qml
@@ -134,11 +134,11 @@ TestCase {
         var control = createTemporaryObject(tabButton, testCase, {
             text: "TabButton",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 622554c7..926b4595 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -199,11 +199,11 @@ TestCase {
         var control = createTemporaryObject(toolButton, testCase, {
             text: "ToolButton",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/qquickiconlabel/data/colorChanges.qml b/tests/auto/qquickiconlabel/data/colorChanges.qml
index 954c1ef4..7fe8949c 100644
--- a/tests/auto/qquickiconlabel/data/colorChanges.qml
+++ b/tests/auto/qquickiconlabel/data/colorChanges.qml
@@ -56,7 +56,7 @@ AbstractButton {
     id: button
     width: 200
     height: 200
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
     icon.color: enabled ? "transparent" : "red"
 
     IconLabel {
diff --git a/tests/auto/qquickiconlabel/data/iconlabel.qml b/tests/auto/qquickiconlabel/data/iconlabel.qml
index b82f9faf..2676c564 100644
--- a/tests/auto/qquickiconlabel/data/iconlabel.qml
+++ b/tests/auto/qquickiconlabel/data/iconlabel.qml
@@ -57,7 +57,7 @@ AbstractButton {
     width: 200
     height: 200
     text: "Some text"
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
 
     IconLabel {
         icon: button.icon
diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
index 61c9f74c..961effdd 100644
--- a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
+++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
@@ -56,7 +56,7 @@ AbstractButton {
     id: button
     width: 200
     height: 200
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
 
     IconLabel {
         spacing: 10
diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp
index 35c48970..78e3beff 100644
--- a/tests/auto/sanity/tst_sanity.cpp
+++ b/tests/auto/sanity/tst_sanity.cpp
@@ -365,8 +365,8 @@ void tst_Sanity::attachedObjects()
 void tst_Sanity::attachedObjects_data()
 {
     QTest::addColumn<QUrl>("url");
-    addTestRowForEachControl(&engine, "controls", "QtQuick/Controls.2");
-    addTestRowForEachControl(&engine, "controls/fusion", "QtQuick/Controls.2", QStringList() << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
+    addTestRowForEachControl(&engine, "controls/default", "QtQuick/Controls.2/Default");
+    addTestRowForEachControl(&engine, "controls/fusion", "QtQuick/Controls.2/Fusion", QStringList() << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
     addTestRowForEachControl(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate");
     addTestRowForEachControl(&engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator");
 }