Rename "Default" style to "Basic"

[ChangeLog][Styles] The Default style was renamed to Basic to account
for the introduction of the platform styles (macOS, Windows), which
will be used by default (where possible) when no style is specified.

Fixes: QTBUG-85984
Task-number: QTBUG-68814
Task-number: QTBUG-86403
Change-Id: I22b3199c8662e4ee5d55a1be1a51c9856ac62376
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

125 files changed, 267 insertions, 267 deletions

diff --git a/src/imports/controls/default/.prev_CMakeLists.txt b/src/imports/controls/basic/.prev_CMakeLists.txt
index 9a37f29c..c9a11827 100644
--- a/src/imports/controls/default/.prev_CMakeLists.txt
+++ b/src/imports/controls/basic/.prev_CMakeLists.txt
@@ -1,18 +1,18 @@
-# Generated from default.pro.
+# Generated from basic.pro.
 
 #####################################################################
-## qtquickcontrols2defaultstyleplugin Plugin:
+## qtquickcontrols2basicstyleplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qtquickcontrols2defaultstyleplugin
-    URI "QtQuick.Controls.Default"
+qt_add_qml_module(qtquickcontrols2basicstyleplugin
+    URI "QtQuick.Controls.Basic"
     VERSION "${CMAKE_PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2DefaultStylePlugin
+    CLASSNAME QtQuickControls2BasicStylePlugin
     GENERATE_QMLTYPES
     SOURCES
-        qquickdefaultstyle.cpp qquickdefaultstyle_p.h
-        qquickdefaulttheme.cpp qquickdefaulttheme_p.h
-        qtquickcontrols2defaultstyleplugin.cpp
+        qquickbasicstyle.cpp qquickbasicstyle_p.h
+        qquickbasictheme.cpp qquickbasictheme_p.h
+        qtquickcontrols2basicstyleplugin.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
@@ -31,7 +31,7 @@ qt_add_qml_module(qtquickcontrols2defaultstyleplugin
 )
 
 # Resources:
-set(qtquickcontrols2defaultstyleplugin_resource_files
+set(qtquickcontrols2basicstyleplugin_resource_files
     "images/arrow-indicator.png"
     "images/arrow-indicator@2x.png"
     "images/arrow-indicator@3x.png"
@@ -54,20 +54,20 @@ set(qtquickcontrols2defaultstyleplugin_resource_files
     "images/drop-indicator@4x.png"
 )
 
-qt_add_resource(qtquickcontrols2defaultstyleplugin "qtquickcontrols2defaultstyleplugin"
+qt_add_resource(qtquickcontrols2basicstyleplugin "qtquickcontrols2basicstyleplugin"
     PREFIX
-        "/qt-project.org/imports/QtQuick/Controls/Default"
+        "/qt-project.org/imports/QtQuick/Controls/Basic"
     FILES
-        ${qtquickcontrols2defaultstyleplugin_resource_files}
+        ${qtquickcontrols2basicstyleplugin_resource_files}
 )
 
 
-#### Keys ignored in scope 1:.:.:default.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:basic.pro:<TRUE>:
 # OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_NAME = "QtQuick.Controls.Default"
+# QML_IMPORT_NAME = "QtQuick.Controls.Basic"
 # QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Controls/Default"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-default)"
+# TARGETPATH = "QtQuick/Controls/Basic"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-basic)"
 
 set(qml_files
     "AbstractButton.qml"
@@ -300,7 +300,7 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
 
-qt6_target_qml_files(qtquickcontrols2defaultstyleplugin
+qt6_target_qml_files(qtquickcontrols2basicstyleplugin
     FILES
         ${qml_files}
 )
diff --git a/src/imports/controls/default/AbstractButton.qml b/src/imports/controls/basic/AbstractButton.qml
index a4855c21..a4855c21 100644
--- a/src/imports/controls/default/AbstractButton.qml
+++ b/src/imports/controls/basic/AbstractButton.qml
diff --git a/src/imports/controls/default/Action.qml b/src/imports/controls/basic/Action.qml
index bb66fc8f..bb66fc8f 100644
--- a/src/imports/controls/default/Action.qml
+++ b/src/imports/controls/basic/Action.qml
diff --git a/src/imports/controls/default/ActionGroup.qml b/src/imports/controls/basic/ActionGroup.qml
index 70170f0e..70170f0e 100644
--- a/src/imports/controls/default/ActionGroup.qml
+++ b/src/imports/controls/basic/ActionGroup.qml
diff --git a/src/imports/controls/default/ApplicationWindow.qml b/src/imports/controls/basic/ApplicationWindow.qml
index b383139b..b383139b 100644
--- a/src/imports/controls/default/ApplicationWindow.qml
+++ b/src/imports/controls/basic/ApplicationWindow.qml
diff --git a/src/imports/controls/default/BusyIndicator.qml b/src/imports/controls/basic/BusyIndicator.qml
index 5db2a083..1dc2b5bd 100644
--- a/src/imports/controls/default/BusyIndicator.qml
+++ b/src/imports/controls/basic/BusyIndicator.qml
@@ -36,7 +36,7 @@
 
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.Default.impl
+import QtQuick.Controls.Basic.impl
 import QtQuick.Templates as T
 
 T.BusyIndicator {
diff --git a/src/imports/controls/default/Button.qml b/src/imports/controls/basic/Button.qml
index 06d4e93f..06d4e93f 100644
--- a/src/imports/controls/default/Button.qml
+++ b/src/imports/controls/basic/Button.qml
diff --git a/src/imports/controls/default/ButtonGroup.qml b/src/imports/controls/basic/ButtonGroup.qml
index fadc538a..fadc538a 100644
--- a/src/imports/controls/default/ButtonGroup.qml
+++ b/src/imports/controls/basic/ButtonGroup.qml
diff --git a/src/imports/controls/default/CMakeLists.txt b/src/imports/controls/basic/CMakeLists.txt
index f7ce5d10..9e2252d4 100644
--- a/src/imports/controls/default/CMakeLists.txt
+++ b/src/imports/controls/basic/CMakeLists.txt
@@ -1,18 +1,18 @@
-# Generated from default.pro.
+# Generated from basic.pro.
 
 #####################################################################
-## qtquickcontrols2defaultstyleplugin Plugin:
+## qtquickcontrols2basicstyleplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qtquickcontrols2defaultstyleplugin
-    URI "QtQuick.Controls.Default"
+qt_add_qml_module(qtquickcontrols2basicstyleplugin
+    URI "QtQuick.Controls.Basic"
     VERSION "6.0" # special case
-    CLASSNAME QtQuickControls2DefaultStylePlugin
+    CLASSNAME QtQuickControls2BasicStylePlugin
     GENERATE_QMLTYPES
     SOURCES
-        qquickdefaultstyle.cpp qquickdefaultstyle_p.h
-        qquickdefaulttheme.cpp qquickdefaulttheme_p.h
-        qtquickcontrols2defaultstyleplugin.cpp
+        qquickbasicstyle.cpp qquickbasicstyle_p.h
+        qquickbasictheme.cpp qquickbasictheme_p.h
+        qtquickcontrols2basicstyleplugin.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
@@ -31,7 +31,7 @@ qt_add_qml_module(qtquickcontrols2defaultstyleplugin
 )
 
 # Resources:
-set(qtquickcontrols2defaultstyleplugin_resource_files
+set(qtquickcontrols2basicstyleplugin_resource_files
     "images/arrow-indicator.png"
     "images/arrow-indicator@2x.png"
     "images/arrow-indicator@3x.png"
@@ -54,20 +54,20 @@ set(qtquickcontrols2defaultstyleplugin_resource_files
     "images/drop-indicator@4x.png"
 )
 
-qt_add_resource(qtquickcontrols2defaultstyleplugin "qtquickcontrols2defaultstyleplugin"
+qt_add_resource(qtquickcontrols2basicstyleplugin "qtquickcontrols2basicstyleplugin"
     PREFIX
-        "/qt-project.org/imports/QtQuick/Controls/Default"
+        "/qt-project.org/imports/QtQuick/Controls/Basic"
     FILES
-        ${qtquickcontrols2defaultstyleplugin_resource_files}
+        ${qtquickcontrols2basicstyleplugin_resource_files}
 )
 
 
-#### Keys ignored in scope 1:.:.:default.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:basic.pro:<TRUE>:
 # OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_NAME = "QtQuick.Controls.Default"
+# QML_IMPORT_NAME = "QtQuick.Controls.Basic"
 # QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Controls/Default"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-default)"
+# TARGETPATH = "QtQuick/Controls/Basic"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-basic)"
 
 set(qml_files
     "AbstractButton.qml"
@@ -300,7 +300,7 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
 
-qt6_target_qml_files(qtquickcontrols2defaultstyleplugin
+qt6_target_qml_files(qtquickcontrols2basicstyleplugin
     FILES
         ${qml_files}
 )
diff --git a/src/imports/controls/default/CheckBox.qml b/src/imports/controls/basic/CheckBox.qml
index d9c92a56..7d29ff34 100644
--- a/src/imports/controls/default/CheckBox.qml
+++ b/src/imports/controls/basic/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/Default/images/check.png"
+            source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
             visible: control.checkState === Qt.Checked
         }
 
diff --git a/src/imports/controls/default/CheckDelegate.qml b/src/imports/controls/basic/CheckDelegate.qml
index 3153bb3e..25eb3c06 100644
--- a/src/imports/controls/default/CheckDelegate.qml
+++ b/src/imports/controls/basic/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/Default/images/check.png"
+            source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
             visible: control.checkState === Qt.Checked
         }
 
diff --git a/src/imports/controls/default/ComboBox.qml b/src/imports/controls/basic/ComboBox.qml
index e1e60164..935befd3 100644
--- a/src/imports/controls/default/ComboBox.qml
+++ b/src/imports/controls/basic/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/Default/images/double-arrow.png"
+        source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/double-arrow.png"
         opacity: enabled ? 1 : 0.3
     }
 
diff --git a/src/imports/controls/default/Container.qml b/src/imports/controls/basic/Container.qml
index 93919075..93919075 100644
--- a/src/imports/controls/default/Container.qml
+++ b/src/imports/controls/basic/Container.qml
diff --git a/src/imports/controls/default/Control.qml b/src/imports/controls/basic/Control.qml
index 7a68a431..7a68a431 100644
--- a/src/imports/controls/default/Control.qml
+++ b/src/imports/controls/basic/Control.qml
diff --git a/src/imports/controls/default/DelayButton.qml b/src/imports/controls/basic/DelayButton.qml
index 3dbed315..3dbed315 100644
--- a/src/imports/controls/default/DelayButton.qml
+++ b/src/imports/controls/basic/DelayButton.qml
diff --git a/src/imports/controls/default/Dial.qml b/src/imports/controls/basic/Dial.qml
index 80f2bfb0..979d3644 100644
--- a/src/imports/controls/default/Dial.qml
+++ b/src/imports/controls/basic/Dial.qml
@@ -37,7 +37,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Controls.impl
-import QtQuick.Controls.Default.impl
+import QtQuick.Controls.Basic.impl
 import QtQuick.Templates as T
 
 T.Dial {
@@ -63,7 +63,7 @@ T.Dial {
         height: 10
         defaultColor: "#353637"
         color: control.visualFocus ? control.palette.highlight : control.palette.dark
-        source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/dial-indicator.png"
+        source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/dial-indicator.png"
         antialiasing: true
         opacity: control.enabled ? 1 : 0.3
         transform: [
diff --git a/src/imports/controls/default/Dialog.qml b/src/imports/controls/basic/Dialog.qml
index 254a6dcb..254a6dcb 100644
--- a/src/imports/controls/default/Dialog.qml
+++ b/src/imports/controls/basic/Dialog.qml
diff --git a/src/imports/controls/default/DialogButtonBox.qml b/src/imports/controls/basic/DialogButtonBox.qml
index e4cdbd14..e4cdbd14 100644
--- a/src/imports/controls/default/DialogButtonBox.qml
+++ b/src/imports/controls/basic/DialogButtonBox.qml
diff --git a/src/imports/controls/default/Drawer.qml b/src/imports/controls/basic/Drawer.qml
index 719e5e1c..719e5e1c 100644
--- a/src/imports/controls/default/Drawer.qml
+++ b/src/imports/controls/basic/Drawer.qml
diff --git a/src/imports/controls/default/Frame.qml b/src/imports/controls/basic/Frame.qml
index 9696b5c9..9696b5c9 100644
--- a/src/imports/controls/default/Frame.qml
+++ b/src/imports/controls/basic/Frame.qml
diff --git a/src/imports/controls/default/GroupBox.qml b/src/imports/controls/basic/GroupBox.qml
index d6244113..d6244113 100644
--- a/src/imports/controls/default/GroupBox.qml
+++ b/src/imports/controls/basic/GroupBox.qml
diff --git a/src/imports/controls/default/HorizontalHeaderView.qml b/src/imports/controls/basic/HorizontalHeaderView.qml
index 093c868b..093c868b 100644
--- a/src/imports/controls/default/HorizontalHeaderView.qml
+++ b/src/imports/controls/basic/HorizontalHeaderView.qml
diff --git a/src/imports/controls/default/ItemDelegate.qml b/src/imports/controls/basic/ItemDelegate.qml
index 1183eb2b..1183eb2b 100644
--- a/src/imports/controls/default/ItemDelegate.qml
+++ b/src/imports/controls/basic/ItemDelegate.qml
diff --git a/src/imports/controls/default/Label.qml b/src/imports/controls/basic/Label.qml
index 6d0aca41..6d0aca41 100644
--- a/src/imports/controls/default/Label.qml
+++ b/src/imports/controls/basic/Label.qml
diff --git a/src/imports/controls/default/Menu.qml b/src/imports/controls/basic/Menu.qml
index 91384e4f..91384e4f 100644
--- a/src/imports/controls/default/Menu.qml
+++ b/src/imports/controls/basic/Menu.qml
diff --git a/src/imports/controls/default/MenuBar.qml b/src/imports/controls/basic/MenuBar.qml
index 9745a52d..9745a52d 100644
--- a/src/imports/controls/default/MenuBar.qml
+++ b/src/imports/controls/basic/MenuBar.qml
diff --git a/src/imports/controls/default/MenuBarItem.qml b/src/imports/controls/basic/MenuBarItem.qml
index b2771a3c..b2771a3c 100644
--- a/src/imports/controls/default/MenuBarItem.qml
+++ b/src/imports/controls/basic/MenuBarItem.qml
diff --git a/src/imports/controls/default/MenuItem.qml b/src/imports/controls/basic/MenuItem.qml
index fc2d434f..143e4df3 100644
--- a/src/imports/controls/default/MenuItem.qml
+++ b/src/imports/controls/basic/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/Default/images/check.png" : ""
+        source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/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/Default/images/arrow-indicator.png" : ""
+        source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/arrow-indicator.png" : ""
         color: control.palette.windowText
         defaultColor: "#353637"
     }
diff --git a/src/imports/controls/default/MenuSeparator.qml b/src/imports/controls/basic/MenuSeparator.qml
index d503aecd..d503aecd 100644
--- a/src/imports/controls/default/MenuSeparator.qml
+++ b/src/imports/controls/basic/MenuSeparator.qml
diff --git a/src/imports/controls/default/Page.qml b/src/imports/controls/basic/Page.qml
index 2fec37f0..2fec37f0 100644
--- a/src/imports/controls/default/Page.qml
+++ b/src/imports/controls/basic/Page.qml
diff --git a/src/imports/controls/default/PageIndicator.qml b/src/imports/controls/basic/PageIndicator.qml
index 3942f54f..3942f54f 100644
--- a/src/imports/controls/default/PageIndicator.qml
+++ b/src/imports/controls/basic/PageIndicator.qml
diff --git a/src/imports/controls/default/Pane.qml b/src/imports/controls/basic/Pane.qml
index 221819d4..221819d4 100644
--- a/src/imports/controls/default/Pane.qml
+++ b/src/imports/controls/basic/Pane.qml
diff --git a/src/imports/controls/default/Popup.qml b/src/imports/controls/basic/Popup.qml
index 71372107..71372107 100644
--- a/src/imports/controls/default/Popup.qml
+++ b/src/imports/controls/basic/Popup.qml
diff --git a/src/imports/controls/default/ProgressBar.qml b/src/imports/controls/basic/ProgressBar.qml
index 56739f4f..d8a1453c 100644
--- a/src/imports/controls/default/ProgressBar.qml
+++ b/src/imports/controls/basic/ProgressBar.qml
@@ -37,7 +37,7 @@
 import QtQuick
 import QtQuick.Templates as T
 import QtQuick.Controls
-import QtQuick.Controls.Default.impl
+import QtQuick.Controls.Basic.impl
 
 T.ProgressBar {
     id: control
diff --git a/src/imports/controls/default/RadioButton.qml b/src/imports/controls/basic/RadioButton.qml
index 02b2f627..02b2f627 100644
--- a/src/imports/controls/default/RadioButton.qml
+++ b/src/imports/controls/basic/RadioButton.qml
diff --git a/src/imports/controls/default/RadioDelegate.qml b/src/imports/controls/basic/RadioDelegate.qml
index dc998363..dc998363 100644
--- a/src/imports/controls/default/RadioDelegate.qml
+++ b/src/imports/controls/basic/RadioDelegate.qml
diff --git a/src/imports/controls/default/RangeSlider.qml b/src/imports/controls/basic/RangeSlider.qml
index 1132a78b..1132a78b 100644
--- a/src/imports/controls/default/RangeSlider.qml
+++ b/src/imports/controls/basic/RangeSlider.qml
diff --git a/src/imports/controls/default/RoundButton.qml b/src/imports/controls/basic/RoundButton.qml
index 9445ecdf..9445ecdf 100644
--- a/src/imports/controls/default/RoundButton.qml
+++ b/src/imports/controls/basic/RoundButton.qml
diff --git a/src/imports/controls/default/ScrollBar.qml b/src/imports/controls/basic/ScrollBar.qml
index 1652ea81..1652ea81 100644
--- a/src/imports/controls/default/ScrollBar.qml
+++ b/src/imports/controls/basic/ScrollBar.qml
diff --git a/src/imports/controls/default/ScrollIndicator.qml b/src/imports/controls/basic/ScrollIndicator.qml
index 4f3ece0c..4f3ece0c 100644
--- a/src/imports/controls/default/ScrollIndicator.qml
+++ b/src/imports/controls/basic/ScrollIndicator.qml
diff --git a/src/imports/controls/default/ScrollView.qml b/src/imports/controls/basic/ScrollView.qml
index 76094c6c..76094c6c 100644
--- a/src/imports/controls/default/ScrollView.qml
+++ b/src/imports/controls/basic/ScrollView.qml
diff --git a/src/imports/controls/default/Slider.qml b/src/imports/controls/basic/Slider.qml
index cdd72b76..cdd72b76 100644
--- a/src/imports/controls/default/Slider.qml
+++ b/src/imports/controls/basic/Slider.qml
diff --git a/src/imports/controls/default/SpinBox.qml b/src/imports/controls/basic/SpinBox.qml
index 46eca36e..46eca36e 100644
--- a/src/imports/controls/default/SpinBox.qml
+++ b/src/imports/controls/basic/SpinBox.qml
diff --git a/src/imports/controls/default/SplitView.qml b/src/imports/controls/basic/SplitView.qml
index 020d07ea..020d07ea 100644
--- a/src/imports/controls/default/SplitView.qml
+++ b/src/imports/controls/basic/SplitView.qml
diff --git a/src/imports/controls/default/StackView.qml b/src/imports/controls/basic/StackView.qml
index 3b388e46..3b388e46 100644
--- a/src/imports/controls/default/StackView.qml
+++ b/src/imports/controls/basic/StackView.qml
diff --git a/src/imports/controls/default/SwipeDelegate.qml b/src/imports/controls/basic/SwipeDelegate.qml
index ff56f6f0..ff56f6f0 100644
--- a/src/imports/controls/default/SwipeDelegate.qml
+++ b/src/imports/controls/basic/SwipeDelegate.qml
diff --git a/src/imports/controls/default/SwipeView.qml b/src/imports/controls/basic/SwipeView.qml
index 7fb8d449..7fb8d449 100644
--- a/src/imports/controls/default/SwipeView.qml
+++ b/src/imports/controls/basic/SwipeView.qml
diff --git a/src/imports/controls/default/Switch.qml b/src/imports/controls/basic/Switch.qml
index 12420bed..12420bed 100644
--- a/src/imports/controls/default/Switch.qml
+++ b/src/imports/controls/basic/Switch.qml
diff --git a/src/imports/controls/default/SwitchDelegate.qml b/src/imports/controls/basic/SwitchDelegate.qml
index e2a9f7b5..e2a9f7b5 100644
--- a/src/imports/controls/default/SwitchDelegate.qml
+++ b/src/imports/controls/basic/SwitchDelegate.qml
diff --git a/src/imports/controls/default/TabBar.qml b/src/imports/controls/basic/TabBar.qml
index f1b11ac2..f1b11ac2 100644
--- a/src/imports/controls/default/TabBar.qml
+++ b/src/imports/controls/basic/TabBar.qml
diff --git a/src/imports/controls/default/TabButton.qml b/src/imports/controls/basic/TabButton.qml
index 0935d463..0935d463 100644
--- a/src/imports/controls/default/TabButton.qml
+++ b/src/imports/controls/basic/TabButton.qml
diff --git a/src/imports/controls/default/TextArea.qml b/src/imports/controls/basic/TextArea.qml
index e6a1509e..e6a1509e 100644
--- a/src/imports/controls/default/TextArea.qml
+++ b/src/imports/controls/basic/TextArea.qml
diff --git a/src/imports/controls/default/TextField.qml b/src/imports/controls/basic/TextField.qml
index 2c69d351..2c69d351 100644
--- a/src/imports/controls/default/TextField.qml
+++ b/src/imports/controls/basic/TextField.qml
diff --git a/src/imports/controls/default/ToolBar.qml b/src/imports/controls/basic/ToolBar.qml
index 6f5e54e6..6f5e54e6 100644
--- a/src/imports/controls/default/ToolBar.qml
+++ b/src/imports/controls/basic/ToolBar.qml
diff --git a/src/imports/controls/default/ToolButton.qml b/src/imports/controls/basic/ToolButton.qml
index 63b40233..63b40233 100644
--- a/src/imports/controls/default/ToolButton.qml
+++ b/src/imports/controls/basic/ToolButton.qml
diff --git a/src/imports/controls/default/ToolSeparator.qml b/src/imports/controls/basic/ToolSeparator.qml
index e6d6a7f7..e6d6a7f7 100644
--- a/src/imports/controls/default/ToolSeparator.qml
+++ b/src/imports/controls/basic/ToolSeparator.qml
diff --git a/src/imports/controls/default/ToolTip.qml b/src/imports/controls/basic/ToolTip.qml
index 933b7400..933b7400 100644
--- a/src/imports/controls/default/ToolTip.qml
+++ b/src/imports/controls/basic/ToolTip.qml
diff --git a/src/imports/controls/default/Tumbler.qml b/src/imports/controls/basic/Tumbler.qml
index 89f7f056..89f7f056 100644
--- a/src/imports/controls/default/Tumbler.qml
+++ b/src/imports/controls/basic/Tumbler.qml
diff --git a/src/imports/controls/default/VerticalHeaderView.qml b/src/imports/controls/basic/VerticalHeaderView.qml
index 21e39c39..21e39c39 100644
--- a/src/imports/controls/default/VerticalHeaderView.qml
+++ b/src/imports/controls/basic/VerticalHeaderView.qml
diff --git a/src/imports/controls/default/default.pri b/src/imports/controls/basic/basic.pri
index e7147af4..337f7f36 100644
--- a/src/imports/controls/default/default.pri
+++ b/src/imports/controls/basic/basic.pri
@@ -1,10 +1,10 @@
 HEADERS += \
-    $$PWD/qquickdefaultstyle_p.h \
-    $$PWD/qquickdefaulttheme_p.h
+    $$PWD/qquickbasicstyle_p.h \
+    $$PWD/qquickbasictheme_p.h
 
 SOURCES += \
-    $$PWD/qquickdefaultstyle.cpp \
-    $$PWD/qquickdefaulttheme.cpp
+    $$PWD/qquickbasicstyle.cpp \
+    $$PWD/qquickbasictheme.cpp
 
 QML_FILES += \
     $$PWD/AbstractButton.qml \
diff --git a/src/imports/controls/default/default.pro b/src/imports/controls/basic/basic.pro
index 5ecaafce..3c2993a6 100644
--- a/src/imports/controls/default/default.pro
+++ b/src/imports/controls/basic/basic.pro
@@ -1,7 +1,7 @@
-TARGET = qtquickcontrols2defaultstyleplugin
-TARGETPATH = QtQuick/Controls/Default
+TARGET = qtquickcontrols2basicstyleplugin
+TARGETPATH = QtQuick/Controls/Basic
 
-QML_IMPORT_NAME = QtQuick.Controls.Default
+QML_IMPORT_NAME = QtQuick.Controls.Basic
 QML_IMPORT_VERSION = $$QT_VERSION
 
 QT += qml quick
@@ -9,19 +9,19 @@ QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
-include(default.pri)
+include(basic.pri)
 
 OTHER_FILES += \
     qmldir \
     $$QML_FILES
 
 SOURCES += \
-    $$PWD/qtquickcontrols2defaultstyleplugin.cpp
+    $$PWD/qtquickcontrols2basicstyleplugin.cpp
 
 RESOURCES += \
-    $$PWD/qtquickcontrols2defaultstyleplugin.qrc
+    $$PWD/qtquickcontrols2basicstyleplugin.qrc
 
 CONFIG += qmltypes no_cxx_module install_qml_files builtin_resources qtquickcompiler
 load(qml_plugin)
 
-requires(qtConfig(quickcontrols2-default))
+requires(qtConfig(quickcontrols2-basic))
diff --git a/src/imports/controls/default/dependencies.json b/src/imports/controls/basic/dependencies.json
index 78029004..78029004 100644
--- a/src/imports/controls/default/dependencies.json
+++ b/src/imports/controls/basic/dependencies.json
diff --git a/src/imports/controls/default/images/arrow-indicator.png b/src/imports/controls/basic/images/arrow-indicator.png
index d833d52c..d833d52c 100644
--- a/src/imports/controls/default/images/arrow-indicator.png
+++ b/src/imports/controls/basic/images/arrow-indicator.png
diff --git a/src/imports/controls/default/images/arrow-indicator@2x.png b/src/imports/controls/basic/images/arrow-indicator@2x.png
index 55c7940a..55c7940a 100644
--- a/src/imports/controls/default/images/arrow-indicator@2x.png
+++ b/src/imports/controls/basic/images/arrow-indicator@2x.png
diff --git a/src/imports/controls/default/images/arrow-indicator@3x.png b/src/imports/controls/basic/images/arrow-indicator@3x.png
index c7067c5c..c7067c5c 100644
--- a/src/imports/controls/default/images/arrow-indicator@3x.png
+++ b/src/imports/controls/basic/images/arrow-indicator@3x.png
diff --git a/src/imports/controls/default/images/arrow-indicator@4x.png b/src/imports/controls/basic/images/arrow-indicator@4x.png
index 4c5cf351..4c5cf351 100644
--- a/src/imports/controls/default/images/arrow-indicator@4x.png
+++ b/src/imports/controls/basic/images/arrow-indicator@4x.png
diff --git a/src/imports/controls/default/images/check.png b/src/imports/controls/basic/images/check.png
index 479a8442..479a8442 100644
--- a/src/imports/controls/default/images/check.png
+++ b/src/imports/controls/basic/images/check.png
diff --git a/src/imports/controls/default/images/check@2x.png b/src/imports/controls/basic/images/check@2x.png
index 79663c0b..79663c0b 100644
--- a/src/imports/controls/default/images/check@2x.png
+++ b/src/imports/controls/basic/images/check@2x.png
diff --git a/src/imports/controls/default/images/check@3x.png b/src/imports/controls/basic/images/check@3x.png
index fd0135ab..fd0135ab 100644
--- a/src/imports/controls/default/images/check@3x.png
+++ b/src/imports/controls/basic/images/check@3x.png
diff --git a/src/imports/controls/default/images/check@4x.png b/src/imports/controls/basic/images/check@4x.png
index e7e0b640..e7e0b640 100644
--- a/src/imports/controls/default/images/check@4x.png
+++ b/src/imports/controls/basic/images/check@4x.png
diff --git a/src/imports/controls/default/images/dial-indicator.png b/src/imports/controls/basic/images/dial-indicator.png
index 92357c51..92357c51 100644
--- a/src/imports/controls/default/images/dial-indicator.png
+++ b/src/imports/controls/basic/images/dial-indicator.png
diff --git a/src/imports/controls/default/images/dial-indicator@2x.png b/src/imports/controls/basic/images/dial-indicator@2x.png
index f436443b..f436443b 100644
--- a/src/imports/controls/default/images/dial-indicator@2x.png
+++ b/src/imports/controls/basic/images/dial-indicator@2x.png
diff --git a/src/imports/controls/default/images/dial-indicator@3x.png b/src/imports/controls/basic/images/dial-indicator@3x.png
index d883045b..d883045b 100644
--- a/src/imports/controls/default/images/dial-indicator@3x.png
+++ b/src/imports/controls/basic/images/dial-indicator@3x.png
diff --git a/src/imports/controls/default/images/dial-indicator@4x.png b/src/imports/controls/basic/images/dial-indicator@4x.png
index 79477712..79477712 100644
--- a/src/imports/controls/default/images/dial-indicator@4x.png
+++ b/src/imports/controls/basic/images/dial-indicator@4x.png
diff --git a/src/imports/controls/default/images/double-arrow.png b/src/imports/controls/basic/images/double-arrow.png
index 3ecd7f89..3ecd7f89 100644
--- a/src/imports/controls/default/images/double-arrow.png
+++ b/src/imports/controls/basic/images/double-arrow.png
diff --git a/src/imports/controls/default/images/double-arrow@2x.png b/src/imports/controls/basic/images/double-arrow@2x.png
index eeb03e28..eeb03e28 100644
--- a/src/imports/controls/default/images/double-arrow@2x.png
+++ b/src/imports/controls/basic/images/double-arrow@2x.png
diff --git a/src/imports/controls/default/images/double-arrow@3x.png b/src/imports/controls/basic/images/double-arrow@3x.png
index f0662d20..f0662d20 100644
--- a/src/imports/controls/default/images/double-arrow@3x.png
+++ b/src/imports/controls/basic/images/double-arrow@3x.png
diff --git a/src/imports/controls/default/images/double-arrow@4x.png b/src/imports/controls/basic/images/double-arrow@4x.png
index 10891e91..10891e91 100644
--- a/src/imports/controls/default/images/double-arrow@4x.png
+++ b/src/imports/controls/basic/images/double-arrow@4x.png
diff --git a/src/imports/controls/default/images/drop-indicator.png b/src/imports/controls/basic/images/drop-indicator.png
index 80c1d958..80c1d958 100644
--- a/src/imports/controls/default/images/drop-indicator.png
+++ b/src/imports/controls/basic/images/drop-indicator.png
diff --git a/src/imports/controls/default/images/drop-indicator@2x.png b/src/imports/controls/basic/images/drop-indicator@2x.png
index 6e0f228c..6e0f228c 100644
--- a/src/imports/controls/default/images/drop-indicator@2x.png
+++ b/src/imports/controls/basic/images/drop-indicator@2x.png
diff --git a/src/imports/controls/default/images/drop-indicator@3x.png b/src/imports/controls/basic/images/drop-indicator@3x.png
index 199752fb..199752fb 100644
--- a/src/imports/controls/default/images/drop-indicator@3x.png
+++ b/src/imports/controls/basic/images/drop-indicator@3x.png
diff --git a/src/imports/controls/default/images/drop-indicator@4x.png b/src/imports/controls/basic/images/drop-indicator@4x.png
index 58311fbe..58311fbe 100644
--- a/src/imports/controls/default/images/drop-indicator@4x.png
+++ b/src/imports/controls/basic/images/drop-indicator@4x.png
diff --git a/src/imports/controls/default/impl/CMakeLists.txt b/src/imports/controls/basic/impl/CMakeLists.txt
index e6258d13..08bffb5d 100644
--- a/src/imports/controls/default/impl/CMakeLists.txt
+++ b/src/imports/controls/basic/impl/CMakeLists.txt
@@ -1,20 +1,20 @@
-# Generated from default-impl.pro.
+# Generated from basic-impl.pro.
 
 #####################################################################
-## qtquickcontrols2defaultstyleimplplugin Plugin:
+## qtquickcontrols2basicstyleimplplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qtquickcontrols2defaultstyleimplplugin
-    URI "QtQuick.Controls.Default.impl"
+qt_add_qml_module(qtquickcontrols2basicstyleimplplugin
+    URI "QtQuick.Controls.Basic.impl"
     VERSION "${CMAKE_PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2DefaultStyleImplPlugin
+    CLASSNAME QtQuickControls2BasicStyleImplPlugin
     SKIP_TYPE_REGISTRATION
     GENERATE_QMLTYPES
     SOURCES
-        qquickdefaultbusyindicator.cpp qquickdefaultbusyindicator_p.h
-        qquickdefaultdial.cpp qquickdefaultdial_p.h
-        qquickdefaultprogressbar.cpp qquickdefaultprogressbar_p.h
-        qtquickcontrols2defaultstyleimplplugin.cpp
+        qquickbasicbusyindicator.cpp qquickbasicbusyindicator_p.h
+        qquickbasicdial.cpp qquickbasicdial_p.h
+        qquickbasicprogressbar.cpp qquickbasicprogressbar_p.h
+        qtquickcontrols2basicstyleimplplugin.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
@@ -32,10 +32,10 @@ qt_add_qml_module(qtquickcontrols2defaultstyleimplplugin
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:default-impl.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:basic-impl.pro:<TRUE>:
 # OTHER_FILES = "qmldir"
-# QML_IMPORT_NAME = "QtQuick.Controls.Default.impl"
+# QML_IMPORT_NAME = "QtQuick.Controls.Basic.impl"
 # QML_IMPORT_VERSION = "$$QT_VERSION"
 # QT_FOR_CONFIG = "quickcontrols2-private"
-# TARGETPATH = "QtQuick/Controls/Default/impl"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-default)"
+# TARGETPATH = "QtQuick/Controls/Basic/impl"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-basic)"
diff --git a/src/imports/controls/basic/impl/basic-impl.pro b/src/imports/controls/basic/impl/basic-impl.pro
new file mode 100644
index 00000000..ba60b081
--- /dev/null
+++ b/src/imports/controls/basic/impl/basic-impl.pro
@@ -0,0 +1,30 @@
+TARGET = qtquickcontrols2basicstyleimplplugin
+TARGETPATH = QtQuick/Controls/Basic/impl
+
+QML_IMPORT_NAME = QtQuick.Controls.Basic.impl
+QML_IMPORT_VERSION = $$QT_VERSION
+
+QT += qml quick
+QT_PRIVATE += core-private gui qml-private quick-private quicktemplates2-private quickcontrols2impl-private
+QT_FOR_CONFIG = quickcontrols2-private
+
+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+
+OTHER_FILES += \
+    qmldir
+
+HEADERS += \
+    $$PWD/qquickbasicbusyindicator_p.h \
+    $$PWD/qquickbasicdial_p.h \
+    $$PWD/qquickbasicprogressbar_p.h
+
+SOURCES += \
+    $$PWD/qquickbasicbusyindicator.cpp \
+    $$PWD/qquickbasicdial.cpp \
+    $$PWD/qquickbasicprogressbar.cpp \
+    $$PWD/qtquickcontrols2basicstyleimplplugin.cpp
+
+CONFIG += qmltypes install_qmltypes no_cxx_module
+load(qml_plugin)
+
+requires(qtConfig(quickcontrols2-basic))
diff --git a/src/imports/controls/basic/impl/qmldir b/src/imports/controls/basic/impl/qmldir
new file mode 100644
index 00000000..a5fabe7f
--- /dev/null
+++ b/src/imports/controls/basic/impl/qmldir
@@ -0,0 +1,3 @@
+module QtQuick.Controls.Basic.impl
+plugin qtquickcontrols2basicstyleimplplugin
+classname QtQuickControls2BasicStyleImplPlugin
diff --git a/src/imports/controls/default/impl/qquickdefaultbusyindicator.cpp b/src/imports/controls/basic/impl/qquickbasicbusyindicator.cpp
index 880d869b..7fb3b024 100644
--- a/src/imports/controls/default/impl/qquickdefaultbusyindicator.cpp
+++ b/src/imports/controls/basic/impl/qquickbasicbusyindicator.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaultbusyindicator_p.h"
+#include "qquickbasicbusyindicator_p.h"
 
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qsgadaptationlayer_p.h>
@@ -51,10 +51,10 @@ static QPointF moveCircle(const QPointF &pos, qreal rotation, qreal distance)
     return pos - QTransform().rotate(rotation).map(QPointF(0, distance));
 }
 
-class QQuickDefaultBusyIndicatorNode : public QQuickAnimatedNode
+class QQuickBasicBusyIndicatorNode : public QQuickAnimatedNode
 {
 public:
-    QQuickDefaultBusyIndicatorNode(QQuickDefaultBusyIndicator *item);
+    QQuickBasicBusyIndicatorNode(QQuickBasicBusyIndicator *item);
 
     void updateCurrentTime(int time) override;
     void sync(QQuickItem *item) override;
@@ -64,7 +64,7 @@ private:
     QColor m_fill;
 };
 
-QQuickDefaultBusyIndicatorNode::QQuickDefaultBusyIndicatorNode(QQuickDefaultBusyIndicator *item)
+QQuickBasicBusyIndicatorNode::QQuickBasicBusyIndicatorNode(QQuickBasicBusyIndicator *item)
     : QQuickAnimatedNode(item)
 {
     setLoopCount(Infinite);
@@ -82,7 +82,7 @@ QQuickDefaultBusyIndicatorNode::QQuickDefaultBusyIndicatorNode(QQuickDefaultBusy
     }
 }
 
-void QQuickDefaultBusyIndicatorNode::updateCurrentTime(int time)
+void QQuickBasicBusyIndicatorNode::updateCurrentTime(int time)
 {
     const qreal percentageComplete = time / qreal(TotalDuration);
     const qreal firstPhaseProgress = percentageComplete <= 0.5 ? percentageComplete * 2 : 0;
@@ -104,7 +104,7 @@ void QQuickDefaultBusyIndicatorNode::updateCurrentTime(int time)
     }
 }
 
-void QQuickDefaultBusyIndicatorNode::sync(QQuickItem *item)
+void QQuickBasicBusyIndicatorNode::sync(QQuickItem *item)
 {
     const qreal w = item->width();
     const qreal h = item->height();
@@ -113,8 +113,8 @@ void QQuickDefaultBusyIndicatorNode::sync(QQuickItem *item)
     const qreal dy = (h - sz) / 2;
     const int circleRadius = sz / 12;
 
-    m_pen = static_cast<QQuickDefaultBusyIndicator *>(item)->pen();
-    m_fill = static_cast<QQuickDefaultBusyIndicator *>(item)->fill();
+    m_pen = static_cast<QQuickBasicBusyIndicator *>(item)->pen();
+    m_fill = static_cast<QQuickBasicBusyIndicator *>(item)->fill();
 
     QSGTransformNode *transformNode = static_cast<QSGTransformNode *>(firstChild());
     for (int i = 0; i < CircleCount; ++i) {
@@ -137,18 +137,18 @@ void QQuickDefaultBusyIndicatorNode::sync(QQuickItem *item)
     }
 }
 
-QQuickDefaultBusyIndicator::QQuickDefaultBusyIndicator(QQuickItem *parent) :
+QQuickBasicBusyIndicator::QQuickBasicBusyIndicator(QQuickItem *parent) :
     QQuickItem(parent)
 {
     setFlag(ItemHasContents);
 }
 
-QColor QQuickDefaultBusyIndicator::pen() const
+QColor QQuickBasicBusyIndicator::pen() const
 {
     return m_pen;
 }
 
-void QQuickDefaultBusyIndicator::setPen(const QColor &pen)
+void QQuickBasicBusyIndicator::setPen(const QColor &pen)
 {
     if (pen == m_pen)
         return;
@@ -157,12 +157,12 @@ void QQuickDefaultBusyIndicator::setPen(const QColor &pen)
     update();
 }
 
-QColor QQuickDefaultBusyIndicator::fill() const
+QColor QQuickBasicBusyIndicator::fill() const
 {
     return m_fill;
 }
 
-void QQuickDefaultBusyIndicator::setFill(const QColor &fill)
+void QQuickBasicBusyIndicator::setFill(const QColor &fill)
 {
     if (fill == m_fill)
         return;
@@ -171,23 +171,23 @@ void QQuickDefaultBusyIndicator::setFill(const QColor &fill)
     update();
 }
 
-bool QQuickDefaultBusyIndicator::isRunning() const
+bool QQuickBasicBusyIndicator::isRunning() const
 {
     return isVisible();
 }
 
-void QQuickDefaultBusyIndicator::setRunning(bool running)
+void QQuickBasicBusyIndicator::setRunning(bool running)
 {
     if (running)
         setVisible(true);
 }
 
-int QQuickDefaultBusyIndicator::elapsed() const
+int QQuickBasicBusyIndicator::elapsed() const
 {
     return m_elapsed;
 }
 
-void QQuickDefaultBusyIndicator::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
+void QQuickBasicBusyIndicator::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
 {
     QQuickItem::itemChange(change, data);
     switch (change) {
@@ -203,12 +203,12 @@ void QQuickDefaultBusyIndicator::itemChange(QQuickItem::ItemChange change, const
     }
 }
 
-QSGNode *QQuickDefaultBusyIndicator::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *)
+QSGNode *QQuickBasicBusyIndicator::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *)
 {
-    QQuickDefaultBusyIndicatorNode *node = static_cast<QQuickDefaultBusyIndicatorNode *>(oldNode);
+    QQuickBasicBusyIndicatorNode *node = static_cast<QQuickBasicBusyIndicatorNode *>(oldNode);
     if (isRunning() && width() > 0 && height() > 0) {
         if (!node) {
-            node = new QQuickDefaultBusyIndicatorNode(this);
+            node = new QQuickBasicBusyIndicatorNode(this);
             node->start();
         }
         node->sync(this);
diff --git a/src/imports/controls/default/impl/qquickdefaultbusyindicator_p.h b/src/imports/controls/basic/impl/qquickbasicbusyindicator_p.h
index 5cd60ff5..7eea6656 100644
--- a/src/imports/controls/default/impl/qquickdefaultbusyindicator_p.h
+++ b/src/imports/controls/basic/impl/qquickbasicbusyindicator_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDefaultBusyIndicator : public QQuickItem
+class QQuickBasicBusyIndicator : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QColor pen READ pen WRITE setPen FINAL)
@@ -63,7 +63,7 @@ class QQuickDefaultBusyIndicator : public QQuickItem
     QML_ADDED_IN_VERSION(2, 0)
 
 public:
-    explicit QQuickDefaultBusyIndicator(QQuickItem *parent = nullptr);
+    explicit QQuickBasicBusyIndicator(QQuickItem *parent = nullptr);
 
     QColor pen() const;
     void setPen(const QColor &pen);
@@ -88,6 +88,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickDefaultBusyIndicator)
+QML_DECLARE_TYPE(QQuickBasicBusyIndicator)
 
 #endif // QQUICKDEFAULTBUSYINDICATOR_P_H
diff --git a/src/imports/controls/default/impl/qquickdefaultdial.cpp b/src/imports/controls/basic/impl/qquickbasicdial.cpp
index 1653def7..223e8042 100644
--- a/src/imports/controls/default/impl/qquickdefaultdial.cpp
+++ b/src/imports/controls/basic/impl/qquickbasicdial.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaultdial_p.h"
+#include "qquickbasicdial_p.h"
 
 #include <QtCore/qmath.h>
 #include <QtGui/qpainter.h>
@@ -42,17 +42,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickDefaultDial::QQuickDefaultDial(QQuickItem *parent) :
+QQuickBasicDial::QQuickBasicDial(QQuickItem *parent) :
     QQuickPaintedItem(parent)
 {
 }
 
-qreal QQuickDefaultDial::progress() const
+qreal QQuickBasicDial::progress() const
 {
     return m_progress;
 }
 
-void QQuickDefaultDial::setProgress(qreal progress)
+void QQuickBasicDial::setProgress(qreal progress)
 {
     if (progress == m_progress)
         return;
@@ -61,12 +61,12 @@ void QQuickDefaultDial::setProgress(qreal progress)
     update();
 }
 
-QColor QQuickDefaultDial::color() const
+QColor QQuickBasicDial::color() const
 {
     return m_color;
 }
 
-void QQuickDefaultDial::setColor(const QColor &color)
+void QQuickBasicDial::setColor(const QColor &color)
 {
     if (color == m_color)
         return;
@@ -75,7 +75,7 @@ void QQuickDefaultDial::setColor(const QColor &color)
     update();
 }
 
-void QQuickDefaultDial::paint(QPainter *painter)
+void QQuickBasicDial::paint(QPainter *painter)
 {
     if (width() <= 0 || height() <= 0)
         return;
diff --git a/src/imports/controls/default/impl/qquickdefaultdial_p.h b/src/imports/controls/basic/impl/qquickbasicdial_p.h
index 7cdc5e9a..bd9bbb72 100644
--- a/src/imports/controls/default/impl/qquickdefaultdial_p.h
+++ b/src/imports/controls/basic/impl/qquickbasicdial_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDefaultDial : public QQuickPaintedItem
+class QQuickBasicDial : public QQuickPaintedItem
 {
     Q_OBJECT
     Q_PROPERTY(qreal progress READ progress WRITE setProgress FINAL)
@@ -62,7 +62,7 @@ class QQuickDefaultDial : public QQuickPaintedItem
     QML_ADDED_IN_VERSION(2, 0)
 
 public:
-    explicit QQuickDefaultDial(QQuickItem *parent = nullptr);
+    explicit QQuickBasicDial(QQuickItem *parent = nullptr);
 
     qreal progress() const;
     void setProgress(qreal progress);
diff --git a/src/imports/controls/default/impl/qquickdefaultprogressbar.cpp b/src/imports/controls/basic/impl/qquickbasicprogressbar.cpp
index fcaada94..717082af 100644
--- a/src/imports/controls/default/impl/qquickdefaultprogressbar.cpp
+++ b/src/imports/controls/basic/impl/qquickbasicprogressbar.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaultprogressbar_p.h"
+#include "qquickbasicprogressbar_p.h"
 
 #include <QtCore/qeasingcurve.h>
 #include <QtQuick/private/qquickitem_p.h>
@@ -68,10 +68,10 @@ static inline qreal blockEndX(int blockIndex, qreal availableWidth)
     return availableWidth - blockStartX(Blocks - 1 - blockIndex) - BlockWidth;
 }
 
-class QQuickDefaultProgressBarNode : public QQuickAnimatedNode
+class QQuickBasicProgressBarNode : public QQuickAnimatedNode
 {
 public:
-    QQuickDefaultProgressBarNode(QQuickDefaultProgressBar *item);
+    QQuickBasicProgressBarNode(QQuickBasicProgressBar *item);
 
     void updateCurrentTime(int time) override;
     void sync(QQuickItem *item) override;
@@ -81,7 +81,7 @@ private:
     qreal m_pixelsPerSecond = 0;
 };
 
-QQuickDefaultProgressBarNode::QQuickDefaultProgressBarNode(QQuickDefaultProgressBar *item)
+QQuickBasicProgressBarNode::QQuickBasicProgressBarNode(QQuickBasicProgressBar *item)
     : QQuickAnimatedNode(item),
       m_pixelsPerSecond(item->width())
 {
@@ -89,7 +89,7 @@ QQuickDefaultProgressBarNode::QQuickDefaultProgressBarNode(QQuickDefaultProgress
     setDuration(TotalDuration);
 }
 
-void QQuickDefaultProgressBarNode::updateCurrentTime(int time)
+void QQuickBasicProgressBarNode::updateCurrentTime(int time)
 {
     QSGTransformNode *transformNode = static_cast<QSGTransformNode*>(firstChild());
     for (int i = 0; i < Blocks; ++i) {
@@ -142,9 +142,9 @@ void QQuickDefaultProgressBarNode::updateCurrentTime(int time)
     }
 }
 
-void QQuickDefaultProgressBarNode::sync(QQuickItem *item)
+void QQuickBasicProgressBarNode::sync(QQuickItem *item)
 {
-    QQuickDefaultProgressBar *bar = static_cast<QQuickDefaultProgressBar *>(item);
+    QQuickBasicProgressBar *bar = static_cast<QQuickBasicProgressBar *>(item);
     if (m_indeterminate != bar->isIndeterminate()) {
         m_indeterminate = bar->isIndeterminate();
         if (m_indeterminate)
@@ -207,18 +207,18 @@ void QQuickDefaultProgressBarNode::sync(QQuickItem *item)
     }
 }
 
-QQuickDefaultProgressBar::QQuickDefaultProgressBar(QQuickItem *parent) :
+QQuickBasicProgressBar::QQuickBasicProgressBar(QQuickItem *parent) :
     QQuickItem(parent)
 {
     setFlag(ItemHasContents);
 }
 
-qreal QQuickDefaultProgressBar::progress() const
+qreal QQuickBasicProgressBar::progress() const
 {
     return m_progress;
 }
 
-void QQuickDefaultProgressBar::setProgress(qreal progress)
+void QQuickBasicProgressBar::setProgress(qreal progress)
 {
     if (progress == m_progress)
         return;
@@ -227,12 +227,12 @@ void QQuickDefaultProgressBar::setProgress(qreal progress)
     update();
 }
 
-bool QQuickDefaultProgressBar::isIndeterminate() const
+bool QQuickBasicProgressBar::isIndeterminate() const
 {
     return m_indeterminate;
 }
 
-void QQuickDefaultProgressBar::setIndeterminate(bool indeterminate)
+void QQuickBasicProgressBar::setIndeterminate(bool indeterminate)
 {
     if (indeterminate == m_indeterminate)
         return;
@@ -242,12 +242,12 @@ void QQuickDefaultProgressBar::setIndeterminate(bool indeterminate)
     update();
 }
 
-QColor QQuickDefaultProgressBar::color() const
+QColor QQuickBasicProgressBar::color() const
 {
     return m_color;
 }
 
-void QQuickDefaultProgressBar::setColor(const QColor &color)
+void QQuickBasicProgressBar::setColor(const QColor &color)
 {
     if (color == m_color)
         return;
@@ -256,19 +256,19 @@ void QQuickDefaultProgressBar::setColor(const QColor &color)
     update();
 }
 
-void QQuickDefaultProgressBar::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
+void QQuickBasicProgressBar::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
 {
     QQuickItem::itemChange(change, data);
     if (change == ItemVisibleHasChanged)
         update();
 }
 
-QSGNode *QQuickDefaultProgressBar::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *)
+QSGNode *QQuickBasicProgressBar::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *)
 {
-    QQuickDefaultProgressBarNode *node = static_cast<QQuickDefaultProgressBarNode *>(oldNode);
+    QQuickBasicProgressBarNode *node = static_cast<QQuickBasicProgressBarNode *>(oldNode);
     if (isVisible() && width() > 0 && height() > 0) {
         if (!node)
-            node = new QQuickDefaultProgressBarNode(this);
+            node = new QQuickBasicProgressBarNode(this);
         node->sync(this);
     } else {
         delete node;
diff --git a/src/imports/controls/default/impl/qquickdefaultprogressbar_p.h b/src/imports/controls/basic/impl/qquickbasicprogressbar_p.h
index 3e4955c4..1d853ecb 100644
--- a/src/imports/controls/default/impl/qquickdefaultprogressbar_p.h
+++ b/src/imports/controls/basic/impl/qquickbasicprogressbar_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDefaultProgressBar : public QQuickItem
+class QQuickBasicProgressBar : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate FINAL)
@@ -63,7 +63,7 @@ class QQuickDefaultProgressBar : public QQuickItem
     QML_ADDED_IN_VERSION(2, 0)
 
 public:
-    explicit QQuickDefaultProgressBar(QQuickItem *parent = nullptr);
+    explicit QQuickBasicProgressBar(QQuickItem *parent = nullptr);
 
     bool isIndeterminate() const;
     void setIndeterminate(bool indeterminate);
@@ -86,6 +86,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickDefaultProgressBar)
+QML_DECLARE_TYPE(QQuickBasicProgressBar)
 
 #endif // QQUICKDEFAULTPROGRESSBAR_P_H
diff --git a/src/imports/controls/default/impl/qtquickcontrols2defaultstyleimplplugin.cpp b/src/imports/controls/basic/impl/qtquickcontrols2basicstyleimplplugin.cpp
index 734d32de..8a8bba46 100644
--- a/src/imports/controls/default/impl/qtquickcontrols2defaultstyleimplplugin.cpp
+++ b/src/imports/controls/basic/impl/qtquickcontrols2basicstyleimplplugin.cpp
@@ -38,20 +38,20 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQuickControls2DefaultStyleImplPlugin : public QQmlEngineExtensionPlugin
+class QtQuickControls2BasicStyleImplPlugin : public QQmlEngineExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtQuickControls2DefaultStyleImplPlugin(QObject *parent = nullptr);
+    QtQuickControls2BasicStyleImplPlugin(QObject *parent = nullptr);
 };
 
-QtQuickControls2DefaultStyleImplPlugin::QtQuickControls2DefaultStyleImplPlugin(QObject *parent)
+QtQuickControls2BasicStyleImplPlugin::QtQuickControls2BasicStyleImplPlugin(QObject *parent)
     : QQmlEngineExtensionPlugin(parent)
 {
 }
 
 QT_END_NAMESPACE
 
-#include "qtquickcontrols2defaultstyleimplplugin.moc"
+#include "qtquickcontrols2basicstyleimplplugin.moc"
diff --git a/src/imports/controls/default/qmldir b/src/imports/controls/basic/qmldir
index 4b4645be..136db062 100644
--- a/src/imports/controls/default/qmldir
+++ b/src/imports/controls/basic/qmldir
@@ -1,6 +1,6 @@
-module QtQuick.Controls.Default
-plugin qtquickcontrols2defaultstyleplugin
-classname QtQuickControls2DefaultStylePlugin
+module QtQuick.Controls.Basic
+plugin qtquickcontrols2basicstyleplugin
+classname QtQuickControls2BasicStylePlugin
 
 # QtQuick.Controls 2.0 (originally introduced in Qt 5.7)
 AbstractButton 2.0 AbstractButton.qml
diff --git a/src/imports/controls/default/qquickdefaultstyle.cpp b/src/imports/controls/basic/qquickbasicstyle.cpp
index 15c59798..9dcb7c74 100644
--- a/src/imports/controls/default/qquickdefaultstyle.cpp
+++ b/src/imports/controls/basic/qquickbasicstyle.cpp
@@ -34,211 +34,211 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaultstyle_p.h"
+#include "qquickbasicstyle_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQuickDefaultStyle::QQuickDefaultStyle(QObject *parent) :
+QQuickBasicStyle::QQuickBasicStyle(QObject *parent) :
     QObject(parent)
 {
 }
 
-QColor QQuickDefaultStyle::backgroundColor() const
+QColor QQuickBasicStyle::backgroundColor() const
 {
     return QColor::fromRgba(0xFFFFFFFF);
 }
 
-QColor QQuickDefaultStyle::overlayModalColor() const
+QColor QQuickBasicStyle::overlayModalColor() const
 {
     return QColor::fromRgba(0x7F28282A);
 }
 
-QColor QQuickDefaultStyle::overlayDimColor() const
+QColor QQuickBasicStyle::overlayDimColor() const
 {
     return QColor::fromRgba(0x1F28282A);
 }
 
-QColor QQuickDefaultStyle::textColor() const
+QColor QQuickBasicStyle::textColor() const
 {
     return QColor::fromRgba(0xFF353637);
 }
 
-QColor QQuickDefaultStyle::textDarkColor() const
+QColor QQuickBasicStyle::textDarkColor() const
 {
     return QColor::fromRgba(0xFF26282A);
 }
 
-QColor QQuickDefaultStyle::textLightColor() const
+QColor QQuickBasicStyle::textLightColor() const
 {
     return QColor::fromRgba(0xFFFFFFFF);
 }
 
-QColor QQuickDefaultStyle::textLinkColor() const
+QColor QQuickBasicStyle::textLinkColor() const
 {
     return QColor::fromRgba(0xFF45A7D7);
 }
 
-QColor QQuickDefaultStyle::textSelectionColor() const
+QColor QQuickBasicStyle::textSelectionColor() const
 {
     return QColor::fromRgba(0xFFFDDD5C);
 }
 
-QColor QQuickDefaultStyle::textDisabledColor() const
+QColor QQuickBasicStyle::textDisabledColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
 }
 
-QColor QQuickDefaultStyle::textDisabledLightColor() const
+QColor QQuickBasicStyle::textDisabledLightColor() const
 {
     return QColor::fromRgba(0xFFC2C2C2);
 }
 
-QColor QQuickDefaultStyle::textPlaceholderColor() const
+QColor QQuickBasicStyle::textPlaceholderColor() const
 {
     return QColor::fromRgba(0xFF777777);
 }
 
-QColor QQuickDefaultStyle::focusColor() const
+QColor QQuickBasicStyle::focusColor() const
 {
     return QColor::fromRgba(0xFF0066FF);
 }
 
-QColor QQuickDefaultStyle::focusLightColor() const
+QColor QQuickBasicStyle::focusLightColor() const
 {
     return QColor::fromRgba(0xFFF0F6FF);
 }
 
-QColor QQuickDefaultStyle::focusPressedColor() const
+QColor QQuickBasicStyle::focusPressedColor() const
 {
     return QColor::fromRgba(0xFFCCE0FF);
 }
 
-QColor QQuickDefaultStyle::buttonColor() const
+QColor QQuickBasicStyle::buttonColor() const
 {
     return QColor::fromRgba(0xFFE0E0E0);
 }
 
-QColor QQuickDefaultStyle::buttonPressedColor() const
+QColor QQuickBasicStyle::buttonPressedColor() const
 {
     return QColor::fromRgba(0xFFD0D0D0);
 }
 
-QColor QQuickDefaultStyle::buttonCheckedColor() const
+QColor QQuickBasicStyle::buttonCheckedColor() const
 {
     return QColor::fromRgba(0xFF353637);
 }
 
-QColor QQuickDefaultStyle::buttonCheckedPressedColor() const
+QColor QQuickBasicStyle::buttonCheckedPressedColor() const
 {
     return QColor::fromRgba(0xFF585A5C);
 }
 
-QColor QQuickDefaultStyle::buttonCheckedFocusColor() const
+QColor QQuickBasicStyle::buttonCheckedFocusColor() const
 {
     return QColor::fromRgba(0xFF599BFF);
 }
 
-QColor QQuickDefaultStyle::toolButtonColor() const
+QColor QQuickBasicStyle::toolButtonColor() const
 {
     return QColor::fromRgba(0x33333333);
 }
 
-QColor QQuickDefaultStyle::tabButtonColor() const
+QColor QQuickBasicStyle::tabButtonColor() const
 {
     return QColor::fromRgba(0xFF353637);
 }
 
-QColor QQuickDefaultStyle::tabButtonPressedColor() const
+QColor QQuickBasicStyle::tabButtonPressedColor() const
 {
     return QColor::fromRgba(0xFF585A5C);
 }
 
-QColor QQuickDefaultStyle::tabButtonCheckedPressedColor() const
+QColor QQuickBasicStyle::tabButtonCheckedPressedColor() const
 {
     return QColor::fromRgba(0xFFE4E4E4);
 }
 
-QColor QQuickDefaultStyle::delegateColor() const
+QColor QQuickBasicStyle::delegateColor() const
 {
     return QColor::fromRgba(0xFFEEEEEE);
 }
 
-QColor QQuickDefaultStyle::delegatePressedColor() const
+QColor QQuickBasicStyle::delegatePressedColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
 }
 
-QColor QQuickDefaultStyle::delegateFocusColor() const
+QColor QQuickBasicStyle::delegateFocusColor() const
 {
     return QColor::fromRgba(0xFFE5EFFF);
 }
 
-QColor QQuickDefaultStyle::indicatorPressedColor() const
+QColor QQuickBasicStyle::indicatorPressedColor() const
 {
     return QColor::fromRgba(0xFFF6F6F6);
 }
 
-QColor QQuickDefaultStyle::indicatorDisabledColor() const
+QColor QQuickBasicStyle::indicatorDisabledColor() const
 {
     return QColor::fromRgba(0xFFFDFDFD);
 }
 
-QColor QQuickDefaultStyle::indicatorFrameColor() const
+QColor QQuickBasicStyle::indicatorFrameColor() const
 {
     return QColor::fromRgba(0xFF909090);
 }
 
-QColor QQuickDefaultStyle::indicatorFramePressedColor() const
+QColor QQuickBasicStyle::indicatorFramePressedColor() const
 {
     return QColor::fromRgba(0xFF808080);
 }
 
-QColor QQuickDefaultStyle::indicatorFrameDisabledColor() const
+QColor QQuickBasicStyle::indicatorFrameDisabledColor() const
 {
     return QColor::fromRgba(0xFFD6D6D6);
 }
 
-QColor QQuickDefaultStyle::frameDarkColor() const
+QColor QQuickBasicStyle::frameDarkColor() const
 {
     return QColor::fromRgba(0xFF353637);
 }
 
-QColor QQuickDefaultStyle::frameLightColor() const
+QColor QQuickBasicStyle::frameLightColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
 }
 
-QColor QQuickDefaultStyle::scrollBarColor() const
+QColor QQuickBasicStyle::scrollBarColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
 }
 
-QColor QQuickDefaultStyle::scrollBarPressedColor() const
+QColor QQuickBasicStyle::scrollBarPressedColor() const
 {
     return QColor::fromRgba(0xFF28282A);
 }
 
-QColor QQuickDefaultStyle::progressBarColor() const
+QColor QQuickBasicStyle::progressBarColor() const
 {
     return QColor::fromRgba(0xFFE4E4E4);
 }
 
-QColor QQuickDefaultStyle::pageIndicatorColor() const
+QColor QQuickBasicStyle::pageIndicatorColor() const
 {
     return QColor::fromRgba(0xFF28282A);
 }
 
-QColor QQuickDefaultStyle::separatorColor() const
+QColor QQuickBasicStyle::separatorColor() const
 {
     return QColor::fromRgba(0xFFCCCCCC);
 }
 
-QColor QQuickDefaultStyle::disabledDarkColor() const
+QColor QQuickBasicStyle::disabledDarkColor() const
 {
     return QColor::fromRgba(0xFF353637);
 }
 
-QColor QQuickDefaultStyle::disabledLightColor() const
+QColor QQuickBasicStyle::disabledLightColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
 }
diff --git a/src/imports/controls/default/qquickdefaultstyle_p.h b/src/imports/controls/basic/qquickbasicstyle_p.h
index fa4e77a8..3f3d84b8 100644
--- a/src/imports/controls/default/qquickdefaultstyle_p.h
+++ b/src/imports/controls/basic/qquickbasicstyle_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKDEFAULTSTYLE_P_H
-#define QQUICKDEFAULTSTYLE_P_H
+#ifndef QQUICKBASICSTYLE_P_H
+#define QQUICKBASICSTYLE_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDefaultStyle : public QObject
+class QQuickBasicStyle : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QColor backgroundColor READ backgroundColor CONSTANT FINAL)
@@ -97,12 +97,12 @@ class QQuickDefaultStyle : public QObject
     Q_PROPERTY(QColor separatorColor READ separatorColor CONSTANT FINAL)
     Q_PROPERTY(QColor disabledDarkColor READ disabledDarkColor CONSTANT FINAL)
     Q_PROPERTY(QColor disabledLightColor READ disabledLightColor CONSTANT FINAL)
-    QML_NAMED_ELEMENT(Default)
+    QML_NAMED_ELEMENT(Basic)
     QML_SINGLETON
     QML_ADDED_IN_VERSION(2, 1)
 
 public:
-    explicit QQuickDefaultStyle(QObject *parent = nullptr);
+    explicit QQuickBasicStyle(QObject *parent = nullptr);
 
     QColor backgroundColor() const;
     QColor overlayModalColor() const;
@@ -148,4 +148,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QQUICKDEFAULTSTYLE_P_H
+#endif // QQUICKBASICSTYLE_P_H
diff --git a/src/imports/controls/default/qquickdefaulttheme.cpp b/src/imports/controls/basic/qquickbasictheme.cpp
index 26fb2a2f..1f876e3d 100644
--- a/src/imports/controls/default/qquickdefaulttheme.cpp
+++ b/src/imports/controls/basic/qquickbasictheme.cpp
@@ -34,13 +34,13 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaulttheme_p.h"
+#include "qquickbasictheme_p.h"
 
 #include <QtQuickTemplates2/private/qquicktheme_p.h>
 
 QT_BEGIN_NAMESPACE
 
-void QQuickDefaultTheme::initialize(QQuickTheme *theme)
+void QQuickBasicTheme::initialize(QQuickTheme *theme)
 {
     QPalette systemPalette;
 
diff --git a/src/imports/controls/default/qquickdefaulttheme_p.h b/src/imports/controls/basic/qquickbasictheme_p.h
index 3a7311c7..a0a29953 100644
--- a/src/imports/controls/default/qquickdefaulttheme_p.h
+++ b/src/imports/controls/basic/qquickbasictheme_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKDEFAULTTHEME_P_H
-#define QQUICKDEFAULTTHEME_P_H
+#ifndef QQUICKBASICTHEME_P_H
+#define QQUICKBASICTHEME_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickTheme;
 
-class QQuickDefaultTheme
+class QQuickBasicTheme
 {
 public:
     static void initialize(QQuickTheme *theme);
@@ -62,4 +62,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QQUICKDEFAULTTHEME_P_H
+#endif // QQUICKBASICTHEME_P_H
diff --git a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp b/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.cpp
index c7259a29..cf5adf1c 100644
--- a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp
+++ b/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.cpp
@@ -34,42 +34,42 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaultstyle_p.h"
-#include "qquickdefaulttheme_p.h"
+#include "qquickbasicstyle_p.h"
+#include "qquickbasictheme_p.h"
 
 #include <QtQuickControls2/private/qquickstyleplugin_p.h>
 #include <QtQuickTemplates2/private/qquicktheme_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QtQuickControls2DefaultStylePlugin: public QQuickStylePlugin
+class QtQuickControls2BasicStylePlugin: public QQuickStylePlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtQuickControls2DefaultStylePlugin(QObject *parent = nullptr);
+    QtQuickControls2BasicStylePlugin(QObject *parent = nullptr);
 
     QString name() const override;
     void initializeTheme(QQuickTheme *theme) override;
 
-    QQuickDefaultTheme theme;
+    QQuickBasicTheme theme;
 };
 
-QtQuickControls2DefaultStylePlugin::QtQuickControls2DefaultStylePlugin(QObject *parent) : QQuickStylePlugin(parent)
+QtQuickControls2BasicStylePlugin::QtQuickControls2BasicStylePlugin(QObject *parent) : QQuickStylePlugin(parent)
 {
 }
 
-QString QtQuickControls2DefaultStylePlugin::name() const
+QString QtQuickControls2BasicStylePlugin::name() const
 {
-    return QStringLiteral("Default");
+    return QStringLiteral("Basic");
 }
 
-void QtQuickControls2DefaultStylePlugin::initializeTheme(QQuickTheme *theme)
+void QtQuickControls2BasicStylePlugin::initializeTheme(QQuickTheme *theme)
 {
     this->theme.initialize(theme);
 }
 
 QT_END_NAMESPACE
 
-#include "qtquickcontrols2defaultstyleplugin.moc"
+#include "qtquickcontrols2basicstyleplugin.moc"
diff --git a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc b/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.qrc
index a6058dd1..27fd6ac2 100644
--- a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc
+++ b/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/qt-project.org/imports/QtQuick/Controls/Default">
+    <qresource prefix="/qt-project.org/imports/QtQuick/Controls/Basic">
         <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/default/impl/default-impl.pro b/src/imports/controls/default/impl/default-impl.pro
deleted file mode 100644
index e26ae9ff..00000000
--- a/src/imports/controls/default/impl/default-impl.pro
+++ /dev/null
@@ -1,30 +0,0 @@
-TARGET = qtquickcontrols2defaultstyleimplplugin
-TARGETPATH = QtQuick/Controls/Default/impl
-
-QML_IMPORT_NAME = QtQuick.Controls.Default.impl
-QML_IMPORT_VERSION = $$QT_VERSION
-
-QT += qml quick
-QT_PRIVATE += core-private gui qml-private quick-private quicktemplates2-private quickcontrols2impl-private
-QT_FOR_CONFIG = quickcontrols2-private
-
-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-
-OTHER_FILES += \
-    qmldir
-
-HEADERS += \
-    $$PWD/qquickdefaultbusyindicator_p.h \
-    $$PWD/qquickdefaultdial_p.h \
-    $$PWD/qquickdefaultprogressbar_p.h
-
-SOURCES += \
-    $$PWD/qquickdefaultbusyindicator.cpp \
-    $$PWD/qquickdefaultdial.cpp \
-    $$PWD/qquickdefaultprogressbar.cpp \
-    $$PWD/qtquickcontrols2defaultstyleimplplugin.cpp
-
-CONFIG += qmltypes install_qmltypes no_cxx_module
-load(qml_plugin)
-
-requires(qtConfig(quickcontrols2-default))
diff --git a/src/imports/controls/default/impl/qmldir b/src/imports/controls/default/impl/qmldir
deleted file mode 100644
index a653f1c0..00000000
--- a/src/imports/controls/default/impl/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module QtQuick.Controls.Default.impl
-plugin qtquickcontrols2defaultstyleimplplugin
-classname QtQuickControls2DefaultStyleImplPlugin
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-default-thumbnail.png b/src/imports/controls/doc/images/qtquickcontrols2-basic-thumbnail.png
index e971a7aa..e971a7aa 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-default-thumbnail.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-basic-thumbnail.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-default.png b/src/imports/controls/doc/images/qtquickcontrols2-basic.png
index 099db170..099db170 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-default.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-basic.png
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
index 36d1f848..d7400005 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
 import QtQuick.Controls
 
 Button {
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/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 3fe434e4..3e2aa619 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
 
 Button {
     text: "Button"
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
     display: Button.TextBesideIcon
 }
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-basic.qdoc
index 779f3241..ee8d3ce4 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-basic.qdoc
@@ -26,23 +26,23 @@
 ****************************************************************************/
 
 /*!
-    \page qtquickcontrols2-default.html
-    \title Default Style
+    \page qtquickcontrols2-basic.html
+    \title Basic Style
 
-    The Default style is a basic all-round style.
+    The Basic style is a basic all-round style.
 
-    The Default style is a simple and light-weight style that offers the maximum
+    The Basic style is a simple and light-weight style that offers the maximum
     performance for Qt Quick Controls. It is built with a minimal amount of Qt
     Quick primitives, and keeps animations and transitions to the minimum.
 
-    \image qtquickcontrols2-default.png
+    \image qtquickcontrols2-basic.png
 
     The style is selected by default when running Qt Quick Controls applications.
     It is built into the module's resources, so by default it is shipped with
     any application that depends on the Qt Quick Controls module
 
-    \note The Default style is used as a fallback for other styles. If a style
-    does not implement a certain control, the Default style implementation of
+    \note The Basic style is used as a fallback for other styles. If a style
+    does not implement a certain control, the Basic style implementation of
     that control is selected.
 
     \b {See also} \l {Material Style}, \l {Universal Style}
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
index 7790ddc5..e7149852 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
@@ -77,7 +77,7 @@
             \li \c FallbackStyle
             \li Specifies the style to use for controls that are not implemented.
                 The style must be one of the \l {Available Styles}{built-in styles}.
-                By default, the \l {Default Style}{Default} style is used.
+                By default, the \l {Basic Style}{Basic} style is used.
     \endtable
 
     \section1 Imagine Section
@@ -108,7 +108,7 @@
     be defined in two alternative ways:
 
     \code
-    [Default]
+    [Basic]
     Font\Family=Open Sans
     Font\PixelSize=20
 
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index 484cc5b2..e1ddd1e3 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -44,7 +44,7 @@
 
     The first way to create this button is to simply define it in-place,
     wherever it is needed. For example, perhaps you're not satisfied with the
-    default style's Button having square corners. To make them rounded, you
+    Basic style's Button having square corners. To make them rounded, you
     can override the \l {Control::}{background} item and set the radius
     property of Rectangle:
 
@@ -54,11 +54,11 @@
     button in several places. It involves moving the code into its own QML file
     within your project.
 
-    For this approach, we'll copy the background code from the default style's
+    For this approach, we'll copy the background code from the Basic style's
     \c Button.qml. This file can be found in the following path in your Qt
     installation:
 
-    \c {$QTDIR/qml/QtQuick/Controls/Default/Button.qml}
+    \c {$QTDIR/qml/QtQuick/Controls/Basic/Button.qml}
 
     After doing that, we'll simply add the following line:
 
@@ -158,7 +158,7 @@
         \e mystyle or \e MYSTYLE is not supported.
     \endlist
 
-    By default, the styling system uses the Default style as a fallback for
+    By default, the styling system uses the Basic style as a fallback for
     controls that aren't implemented. To customize or extend any other built-in
     style, it is possible to specify a different fallback style using
     \l[QtQuickControls2]{QQuickStyle}.
@@ -413,8 +413,8 @@
     }
     \endcode
 
-    We then copy \c Button.qml from the Default style in
-    \c {$QTDIR/qml/QtQuick/Controls/Default/} into a new \c myproject folder in our
+    We then copy \c Button.qml from the Basic style in
+    \c {$QTDIR/qml/QtQuick/Controls/Basic/} 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.
 
@@ -497,7 +497,7 @@
 
     \section1 Customization Reference
 
-    The following snippets present examples where the default style's controls
+    The following snippets present examples where the Basic style's controls
     have been customized using the same approach as the
     \l {Customizing a Control} section. The code can be used as a starting
     point to implement a custom look and feel.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
index 135cae71..a99e56fd 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
@@ -83,7 +83,7 @@
                 \image qtquickcontrols2-fusion-violet.png
     \endtable
 
-    \b {See also} \l {Default Style}, \l {Material Style}, \l {Universal Style}
+    \b {See also} \l {Basic Style}, \l {Material Style}, \l {Universal Style}
 
     \section1 Related Information
 
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
index a146843a..f08c5ec3 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
@@ -220,7 +220,7 @@
     \value Material.ShadeA400
     \value Material.ShadeA700
 
-    \b {See also} \l {Default Style}, \l {Universal Style}
+    \b {See also} \l {Basic Style}, \l {Universal Style}
 
     \section2 Variants
 
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
index ddf41771..29e73540 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
@@ -33,10 +33,10 @@
 
     Qt Quick Controls comes with a selection of styles.
 
-    \section2 Default Style
+    \section2 Basic Style
 
-    \image qtquickcontrols2-default-thumbnail.png
-    The \l {Default Style} is a simple and light-weight all-round style that offers
+    \image qtquickcontrols2-basic-thumbnail.png
+    The \l {Basic Style} is a simple and light-weight all-round style that offers
     the maximum performance for Qt Quick Controls.
 
     \section2 Fusion Style
@@ -58,14 +58,14 @@
     The \l {Material Style} offers an appealing design based on the
     \l {https://www.google.com/design/spec/material-design/introduction.html}
     {Google Material Design Guidelines}, but requires more system resources than
-    the Default style.
+    the Basic style.
 
     \section2 Universal Style
 
     \image qtquickcontrols2-universal-thumbnail.png
     The \l {Universal Style} offers an appealing design based on the
     \l {https://dev.windows.com/design}{Microsoft Universal Design Guidelines},
-    but requires more system resources than the Default style.
+    but requires more system resources than the Basic style.
 
     \section1 Using Styles in Qt Quick Controls
 
@@ -141,7 +141,7 @@
 
     \section1 Related Information
     \list
-    \li \l {Default Style}
+    \li \l {Basic Style}
     \li \l {Fusion Style}
     \li \l {Imagine Style}
     \li \l {Material Style}
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
index 1e67dd75..72267050 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
@@ -172,7 +172,7 @@
     \value Universal.Mauve \stylecolor {#76608A} {}
     \value Universal.Taupe \stylecolor {#87794E} {}
 
-    \b {See also} \l {Default Style}, \l {Material Style}
+    \b {See also} \l {Basic Style}, \l {Material Style}
 
     \section1 Attached Property Documentation
 
diff --git a/src/imports/controls/fusion/.prev_CMakeLists.txt b/src/imports/controls/fusion/.prev_CMakeLists.txt
index b9d5e58b..c5c31515 100644
--- a/src/imports/controls/fusion/.prev_CMakeLists.txt
+++ b/src/imports/controls/fusion/.prev_CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2fusionstyleplugin
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQuickControls2FusionStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickfusionstyle.cpp qquickfusionstyle_p.h
diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/imports/controls/fusion/CMakeLists.txt
index 9d93aa89..72a40cfb 100644
--- a/src/imports/controls/fusion/CMakeLists.txt
+++ b/src/imports/controls/fusion/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_add_qml_module(qtquickcontrols2fusionstyleplugin
     VERSION "6.0" # special case
     CLASSNAME QtQuickControls2FusionStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickfusionstyle.cpp qquickfusionstyle_p.h
diff --git a/src/imports/controls/fusion/qmldir b/src/imports/controls/fusion/qmldir
index c08f1e4a..5579a4b5 100644
--- a/src/imports/controls/fusion/qmldir
+++ b/src/imports/controls/fusion/qmldir
@@ -1,7 +1,7 @@
 module QtQuick.Controls.Fusion
 plugin qtquickcontrols2fusionstyleplugin
 classname QtQuickControls2FusionStylePlugin
-import QtQuick.Controls.Default auto
+import QtQuick.Controls.Basic auto
 
 # QtQuick.Controls 2.0 (originally introduced in Qt 5.7)
 ApplicationWindow 2.0 ApplicationWindow.qml
diff --git a/src/imports/controls/imagine/.prev_CMakeLists.txt b/src/imports/controls/imagine/.prev_CMakeLists.txt
index b1e1a959..8d08bcca 100644
--- a/src/imports/controls/imagine/.prev_CMakeLists.txt
+++ b/src/imports/controls/imagine/.prev_CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2imaginestyleplugin
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQuickControls2ImagineStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickimaginestyle.cpp qquickimaginestyle_p.h
diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/imports/controls/imagine/CMakeLists.txt
index ce9b98cb..cb4726e9 100644
--- a/src/imports/controls/imagine/CMakeLists.txt
+++ b/src/imports/controls/imagine/CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2imaginestyleplugin
     VERSION "6.0" # special case
     CLASSNAME QtQuickControls2ImagineStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickimaginestyle.cpp qquickimaginestyle_p.h
diff --git a/src/imports/controls/imagine/qmldir b/src/imports/controls/imagine/qmldir
index 65165bf4..e39f3d18 100644
--- a/src/imports/controls/imagine/qmldir
+++ b/src/imports/controls/imagine/qmldir
@@ -1,7 +1,7 @@
 module QtQuick.Controls.Imagine
 plugin qtquickcontrols2imaginestyleplugin
 classname QtQuickControls2ImagineStylePlugin
-import QtQuick.Controls.Default auto
+import QtQuick.Controls.Basic auto
 
 # QtQuick.Controls 2.0 (originally introduced in Qt 5.7)
 ApplicationWindow 2.0 ApplicationWindow.qml
diff --git a/src/imports/controls/material/.prev_CMakeLists.txt b/src/imports/controls/material/.prev_CMakeLists.txt
index 123c89dc..3f82f1e4 100644
--- a/src/imports/controls/material/.prev_CMakeLists.txt
+++ b/src/imports/controls/material/.prev_CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2materialstyleplugin
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQuickControls2MaterialStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickmaterialstyle.cpp qquickmaterialstyle_p.h
diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt
index 71030fe6..7bc30a96 100644
--- a/src/imports/controls/material/CMakeLists.txt
+++ b/src/imports/controls/material/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_add_qml_module(qtquickcontrols2materialstyleplugin
     VERSION "6.0" # special case
     CLASSNAME QtQuickControls2MaterialStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickmaterialstyle.cpp qquickmaterialstyle_p.h
diff --git a/src/imports/controls/material/qmldir b/src/imports/controls/material/qmldir
index ae8a26fb..82199ec0 100644
--- a/src/imports/controls/material/qmldir
+++ b/src/imports/controls/material/qmldir
@@ -1,7 +1,7 @@
 module QtQuick.Controls.Material
 plugin qtquickcontrols2materialstyleplugin
 classname QtQuickControls2MaterialStylePlugin
-import QtQuick.Controls.Default auto
+import QtQuick.Controls.Basic auto
 
 # QtQuick.Controls 2.0 (originally introduced in Qt 5.7)
 ApplicationWindow 2.0 ApplicationWindow.qml
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 85c51e4f..88fce5ca 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -122,10 +122,10 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
 
     createTheme(styleName);
 
-    // If the style is Default, we don't need to register the fallback because the Default style
+    // If the style is Basic, we don't need to register the fallback because the Basic style
     // provides all controls. Also, if we didn't return early here, we can get an infinite import loop
-    // when the style is set to Default.
-    if (styleName != fallbackStyleName && styleName != QLatin1String("Default")) {
+    // when the style is set to Basic.
+    if (styleName != fallbackStyleName && styleName != QLatin1String("Basic")) {
         registeredFallbackStyleUri = ::fallbackStyleUri();
         qCDebug(lcQtQuickControlsStylePlugin) << "calling qmlRegisterModuleImport() to register fallback style with"
             << " uri \"" << qtQuickControlsUri << "\" moduleMajor" << QQmlModuleImportModuleAny
diff --git a/src/imports/controls/universal/.prev_CMakeLists.txt b/src/imports/controls/universal/.prev_CMakeLists.txt
index df0232e7..f668d683 100644
--- a/src/imports/controls/universal/.prev_CMakeLists.txt
+++ b/src/imports/controls/universal/.prev_CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2universalstyleplugin
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQuickControls2UniversalStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickuniversalstyle.cpp qquickuniversalstyle_p.h
diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt
index f97a92e9..67ccab9b 100644
--- a/src/imports/controls/universal/CMakeLists.txt
+++ b/src/imports/controls/universal/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_add_qml_module(qtquickcontrols2universalstyleplugin
     VERSION "6.0" # special case
     CLASSNAME QtQuickControls2UniversalStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickuniversalstyle.cpp qquickuniversalstyle_p.h
diff --git a/src/imports/controls/universal/qmldir b/src/imports/controls/universal/qmldir
index 5891244a..e864bd76 100644
--- a/src/imports/controls/universal/qmldir
+++ b/src/imports/controls/universal/qmldir
@@ -1,7 +1,7 @@
 module QtQuick.Controls.Universal
 plugin qtquickcontrols2universalstyleplugin
 classname QtQuickControls2UniversalStylePlugin
-import QtQuick.Controls.Default auto
+import QtQuick.Controls.Basic auto
 
 # QtQuick.Controls 2.0 (originally introduced in Qt 5.7)
 ApplicationWindow 2.0 ApplicationWindow.qml