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>

39 files changed, 163 insertions, 168 deletions

diff --git a/tests/auto/controls/CMakeLists.txt b/tests/auto/controls/CMakeLists.txt
index 57cb9480..9e80b765 100644
--- a/tests/auto/controls/CMakeLists.txt
+++ b/tests/auto/controls/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from controls.pro.
 
-add_subdirectory(default)
+add_subdirectory(basic)
 add_subdirectory(fusion)
 add_subdirectory(imagine)
 add_subdirectory(material)
diff --git a/tests/auto/controls/default/CMakeLists.txt b/tests/auto/controls/basic/CMakeLists.txt
index 9a4f6cbd..f19a133f 100644
--- a/tests/auto/controls/default/CMakeLists.txt
+++ b/tests/auto/controls/basic/CMakeLists.txt
@@ -1,7 +1,7 @@
-# Generated from default.pro.
+# Generated from basic.pro.
 
 #####################################################################
-## tst_default Test:
+## tst_basic Test:
 #####################################################################
 
 # Collect test data
@@ -10,11 +10,11 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_default
+qt_add_test(tst_basic
     GUI
     QMLTEST
     SOURCES
-        tst_default.cpp
+        tst_basic.cpp
     DEFINES
         TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../tests/auto/controls/data\\\"
     PUBLIC_LIBRARIES
@@ -22,6 +22,6 @@ qt_add_test(tst_default
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:default.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:basic.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/../data/*.qml"
 # TEMPLATE = "app"
diff --git a/tests/auto/controls/default/default.pro b/tests/auto/controls/basic/basic.pro
index 290edc5f..f50dc036 100644
--- a/tests/auto/controls/default/default.pro
+++ b/tests/auto/controls/basic/basic.pro
@@ -1,11 +1,11 @@
 TEMPLATE = app
-TARGET = tst_default
+TARGET = tst_basic
 CONFIG += qmltestcase
 
 DEFINES += TST_CONTROLS_DATA=\\\"$$QQC2_SOURCE_TREE/tests/auto/controls/data\\\"
 
 SOURCES += \
-    $$PWD/tst_default.cpp
+    $$PWD/tst_basic.cpp
 
 OTHER_FILES += \
     $$PWD/../data/*.qml
diff --git a/tests/auto/controls/default/dependencies.qml b/tests/auto/controls/basic/dependencies.qml
index f7d87422..f7d87422 100644
--- a/tests/auto/controls/default/dependencies.qml
+++ b/tests/auto/controls/basic/dependencies.qml
diff --git a/tests/auto/controls/default/tst_default.cpp b/tests/auto/controls/basic/tst_basic.cpp
index 4c575ce6..24b27cf6 100644
--- a/tests/auto/controls/default/tst_default.cpp
+++ b/tests/auto/controls/basic/tst_basic.cpp
@@ -40,5 +40,5 @@ int main(int argc, char *argv[])
 {
     QTEST_SET_MAIN_SOURCE_PATH
     qputenv("QML_NO_TOUCH_COMPRESSION", "1");
-    return quick_test_main(argc, argv, "tst_controls::Default", TST_CONTROLS_DATA);
+    return quick_test_main(argc, argv, "tst_controls::Basic", TST_CONTROLS_DATA);
 }
diff --git a/tests/auto/controls/controls.pro b/tests/auto/controls/controls.pro
index fd852c4b..af3fb8be 100644
--- a/tests/auto/controls/controls.pro
+++ b/tests/auto/controls/controls.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    default \
+    basic \
     fusion \
     imagine \
     material \
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index f27e5bcb..dbfacff0 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/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/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 e5137787..70f1ae9d 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/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml
index 16a5fe5e..706bf10d 100644
--- a/tests/auto/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml
@@ -298,7 +298,7 @@ TestCase {
 
     Component {
         id: dialogComponent
-        // Based on the Default style, where a single button fills
+        // Based on the Basic style, where a single button fills
         // half the dialog's width and is aligned to the right.
         Dialog {
             id: control
diff --git a/tests/auto/controls/data/tst_itemdelegate.qml b/tests/auto/controls/data/tst_itemdelegate.qml
index 6a4b29b4..7fa4e9e4 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/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/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 be84ae90..713c030e 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/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/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 9a4e2812..87984b2c 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/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/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 c683d457..d7a8832c 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/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/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 98273066..6788e67a 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/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/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 4cf90bb6..fabd6279 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/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/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 c399c014..3f809209 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/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/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 ca044a89..a7acd05a 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/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/font/tst_font.cpp b/tests/auto/font/tst_font.cpp
index 2bee1dce..0794e761 100644
--- a/tests/auto/font/tst_font.cpp
+++ b/tests/auto/font/tst_font.cpp
@@ -300,7 +300,7 @@ void tst_font::defaultFont()
     QQmlComponent component(&engine);
     component.setData(QString("import QtQuick.Controls; %1 { }").arg(control).toUtf8(), QUrl());
 
-    // The call to setData() above causes QQuickDefaultTheme to be set as the current theme,
+    // The call to setData() above causes QQuickBasicTheme to be set as the current theme,
     // so we must make sure we only set our theme afterwards.
     QQuickThemePrivate::instance.reset(new TestFontTheme);
 
diff --git a/tests/auto/palette/qtquickcontrols2.conf b/tests/auto/palette/qtquickcontrols2.conf
index 2ffc7ecc..c5de6b36 100644
--- a/tests/auto/palette/qtquickcontrols2.conf
+++ b/tests/auto/palette/qtquickcontrols2.conf
@@ -1,5 +1,5 @@
-[Default]
+[Basic]
 Palette\Base=#efefef
 
-[Default\Palette]
+[Basic\Palette]
 Text=#101010
diff --git a/tests/auto/palette/tst_palette.cpp b/tests/auto/palette/tst_palette.cpp
index 814d5a11..c42b17a3 100644
--- a/tests/auto/palette/tst_palette.cpp
+++ b/tests/auto/palette/tst_palette.cpp
@@ -294,7 +294,7 @@ void tst_palette::defaultPalette()
     QQmlComponent component(&engine);
     component.setData(QString("import QtQuick.Controls; %1 { }").arg(control).toUtf8(), QUrl());
 
-    // The call to setData() above causes QQuickDefaultTheme to be set as the current theme,
+    // The call to setData() above causes QQuickBasicTheme to be set as the current theme,
     // so we must make sure we only set our theme afterwards.
     std::unique_ptr<QQuickTheme> oldTheme(QQuickThemePrivate::instance.take());
     QQuickThemePrivate::instance.reset(new TestTheme);
diff --git a/tests/auto/qquickiconlabel/data/colorChanges.qml b/tests/auto/qquickiconlabel/data/colorChanges.qml
index 5771e1ed..cd69508e 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/Default/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/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 772b89bd..94f36a7b 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/Default/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
 
     IconLabel {
         icon: button.icon
diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
index 7921babb..c00ffbb8 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/Default/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
 
     IconLabel {
         spacing: 10
diff --git a/tests/auto/qquickstyle/data/default.conf b/tests/auto/qquickstyle/data/basic.conf
index 12ca5d8f..17ef59ee 100644
--- a/tests/auto/qquickstyle/data/default.conf
+++ b/tests/auto/qquickstyle/data/basic.conf
@@ -1,6 +1,6 @@
 [Controls]
-Style=Default
+Style=Basic
 
-[Default]
+[Basic]
 Font\PixelSize=3
 Palette\WindowText=#ff0000
diff --git a/tests/auto/qquickstyle/tst_qquickstyle.cpp b/tests/auto/qquickstyle/tst_qquickstyle.cpp
index c9b7fdbd..f133b617 100644
--- a/tests/auto/qquickstyle/tst_qquickstyle.cpp
+++ b/tests/auto/qquickstyle/tst_qquickstyle.cpp
@@ -109,21 +109,19 @@ void tst_QQuickStyle::configurationFile_data()
 {
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<QString>("expectedStyle");
-    QTest::addColumn<QString>("expectedPath");
-
-    QTest::newRow("Default") << "default.conf" << "Default" << "";
-    QTest::newRow("Fusion") << "fusion.conf" << "Fusion" << "";
-    QTest::newRow("Imagine") << "imagine.conf" << "Imagine" << "";
-    QTest::newRow("Material") << "material.conf" << "Material" << "";
-    QTest::newRow("Universal") << "universal.conf" << "Universal" << "";
-    QTest::newRow("Custom") << "custom.conf" << "Custom" << ":/";
+
+    QTest::newRow("Basic") << "basic.conf" << "Basic";
+    QTest::newRow("Fusion") << "fusion.conf" << "Fusion";
+    QTest::newRow("Imagine") << "imagine.conf" << "Imagine";
+    QTest::newRow("Material") << "material.conf" << "Material";
+    QTest::newRow("Universal") << "universal.conf" << "Universal";
+    QTest::newRow("Custom") << "custom.conf" << "Custom";
 }
 
 void tst_QQuickStyle::configurationFile()
 {
     QFETCH(QString, fileName);
     QFETCH(QString, expectedStyle);
-    QFETCH(QString, expectedPath);
 
     qputenv("QT_QUICK_CONTROLS_CONF", testFile(fileName).toLocal8Bit());
 
diff --git a/tests/auto/sanity/BLACKLIST b/tests/auto/sanity/BLACKLIST
index d6d4b0d9..214c6e7c 100644
--- a/tests/auto/sanity/BLACKLIST
+++ b/tests/auto/sanity/BLACKLIST
@@ -2,9 +2,9 @@
 *
 [attachedObjects:material/SwitchDelegate.qml]
 *
-[ids:default/HorizontalHeaderView.qml]
+[ids:basic/HorizontalHeaderView.qml]
 *
-[ids:default/VerticalHeaderView.qml]
+[ids:basic/VerticalHeaderView.qml]
 *
 [ids:fusion/HorizontalHeaderView.qml]
 *
diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp
index 5dc0676c..f299365a 100644
--- a/tests/auto/sanity/tst_sanity.cpp
+++ b/tests/auto/sanity/tst_sanity.cpp
@@ -175,12 +175,12 @@ void tst_Sanity::initTestCase()
 
     // Then, collect the files from each installed style directory.
     const QVector<QPair<QString, QString>> styleRelativePaths = {
-        { "controls/default", "QtQuick/Controls/Default" },
+        { "controls/basic", "QtQuick/Controls/Basic" },
         { "controls/fusion", "QtQuick/Controls/Fusion" },
         { "controls/material", "QtQuick/Controls/Material" },
         { "controls/universal", "QtQuick/Controls/Universal" },
     };
-    for (const auto stylePathPair : styleRelativePaths) {
+    for (const auto &stylePathPair : styleRelativePaths) {
         forEachControl(&engine, stylePathPair.first, stylePathPair.second, QStringList(),
                 [&](const QString &relativePath, const QUrl &absoluteUrl) {
              installedQmlFiles.insert(relativePath, absoluteUrl.toLocalFile());
@@ -377,7 +377,6 @@ void tst_Sanity::attachedObjects()
     if (styleHelper.updateStyle(style))
         qt_qobjects->clear();
 
-    // Turn e.g. "Default/Button.qml" into "default/Button.qml".
     QString styleRelativePath = tagStr;
     styleRelativePath[0] = styleRelativePath.at(0).toLower();
     // Get the absolute path to the installed file.
@@ -438,67 +437,67 @@ void tst_Sanity::attachedObjects_data()
     // such as DialogButtonBox, which is loaded by Dialog.
     // So now we list all controls and the attached types we expect them to use.
 
-    QTest::newRow("Default/AbstractButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Action.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ActionGroup.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ApplicationWindow.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/BusyIndicator.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Button.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ButtonGroup.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/CheckBox.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/CheckDelegate.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ComboBox.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Container.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Control.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/DelayButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Dial.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Dialog.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Dialog_QMLTYPE" }};
-    QTest::newRow("Default/DialogButtonBox.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Drawer.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Drawer_QMLTYPE" }};
-    QTest::newRow("Default/Frame.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/GroupBox.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/HorizontalHeaderView.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ItemDelegate.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Label.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Menu.qml") << ignoredNames << StringPairSet {
+    QTest::newRow("Basic/AbstractButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Action.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ActionGroup.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ApplicationWindow.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/BusyIndicator.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Button.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ButtonGroup.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/CheckBox.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/CheckDelegate.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ComboBox.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Container.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Control.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/DelayButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Dial.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Dialog.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Dialog_QMLTYPE" }};
+    QTest::newRow("Basic/DialogButtonBox.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Drawer.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Drawer_QMLTYPE" }};
+    QTest::newRow("Basic/Frame.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/GroupBox.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/HorizontalHeaderView.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ItemDelegate.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Label.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Menu.qml") << ignoredNames << StringPairSet {
         { "QQuickOverlayAttached", "Menu_QMLTYPE" },
         { "QQuickScrollIndicatorAttached", "QQuickListView" },
         { "QQuickWindowAttached", "QQuickListView" }
     };
-    QTest::newRow("Default/MenuBar.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/MenuBarItem.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/MenuItem.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/MenuSeparator.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Page.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/PageIndicator.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Pane.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Popup.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Popup_QMLTYPE" }};
-    QTest::newRow("Default/ProgressBar.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/RadioButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/RadioDelegate.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/RangeSlider.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/RoundButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ScrollBar.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ScrollIndicator.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ScrollView.qml") << ignoredNames << StringPairSet {{ "QQuickScrollBarAttached", "ScrollView_QMLTYPE" }};
-    QTest::newRow("Default/Slider.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/SpinBox.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/SplitView.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/StackView.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/SwipeDelegate.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/SwipeView.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Switch.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/SwitchDelegate.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/TabBar.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/TabButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/TextArea.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/TextField.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ToolBar.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ToolButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ToolSeparator.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ToolTip.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Tumbler.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/VerticalHeaderView.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/MenuBar.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/MenuBarItem.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/MenuItem.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/MenuSeparator.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Page.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/PageIndicator.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Pane.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Popup.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Popup_QMLTYPE" }};
+    QTest::newRow("Basic/ProgressBar.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/RadioButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/RadioDelegate.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/RangeSlider.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/RoundButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ScrollBar.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ScrollIndicator.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ScrollView.qml") << ignoredNames << StringPairSet {{ "QQuickScrollBarAttached", "ScrollView_QMLTYPE" }};
+    QTest::newRow("Basic/Slider.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/SpinBox.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/SplitView.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/StackView.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/SwipeDelegate.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/SwipeView.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Switch.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/SwitchDelegate.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/TabBar.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/TabButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/TextArea.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/TextField.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ToolBar.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ToolButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ToolSeparator.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ToolTip.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Tumbler.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/VerticalHeaderView.qml") << ignoredNames << StringPairSet {};
     QTest::newRow("Fusion/ApplicationWindow.qml") << ignoredNames << StringPairSet {};
     QTest::newRow("Fusion/BusyIndicator.qml") << ignoredNames << StringPairSet {};
     QTest::newRow("Fusion/Button.qml") << ignoredNames << StringPairSet {};
diff --git a/tests/auto/snippets/tst_snippets.cpp b/tests/auto/snippets/tst_snippets.cpp
index 1c420edb..17ae6aa6 100644
--- a/tests/auto/snippets/tst_snippets.cpp
+++ b/tests/auto/snippets/tst_snippets.cpp
@@ -114,7 +114,7 @@ void tst_Snippets::verify()
 
     if (takeScreenshots) {
         const QString currentDataTag = QLatin1String(QTest::currentDataTag());
-        static const QString applicationStyle = QQuickStyle::name().isEmpty() ? "Default" : QQuickStyle::name();
+        static const QString applicationStyle = QQuickStyle::name().isEmpty() ? "Basic" : QQuickStyle::name();
         static const QStringList builtInStyles = QQuickStylePrivate::builtInStyles();
 
         bool isStyledSnippet = false;
diff --git a/tests/auto/styleimports/data/importDefaultStyleWithoutControls.qml b/tests/auto/styleimports/data/importBasicStyleWithoutControls.qml
index 421d49ad..40e02666 100644
--- a/tests/auto/styleimports/data/importDefaultStyleWithoutControls.qml
+++ b/tests/auto/styleimports/data/importBasicStyleWithoutControls.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick.Controls.Default
+import QtQuick.Controls.Basic
 
 ApplicationWindow {
     title: "Test Application Window"
diff --git a/tests/auto/styleimports/tst_styleimports.cpp b/tests/auto/styleimports/tst_styleimports.cpp
index fa524098..408f06c3 100644
--- a/tests/auto/styleimports/tst_styleimports.cpp
+++ b/tests/auto/styleimports/tst_styleimports.cpp
@@ -85,56 +85,56 @@ void tst_StyleImports::select_data()
     QTest::addColumn<QString>("fallback");
     QTest::addColumn<QString>("expected");
 
-    // Action.qml exists in the "data" style and the Default style.
-    QTest::newRow("control=Action,style=empty,fallback=empty") << "Action.qml" << "" << "" << "Default";
-    QTest::newRow("control=Action,style=fs,fallback=empty") << "Action.qml" << "FileSystemStyle" << "" << "Default";
-    QTest::newRow("control=Action,style=qrc,fallback=empty") << "Action.qml" << "ResourceStyle" << "" << "Default";
-    QTest::newRow("control=Action,style=nosuch,fallback=empty") << "Action.qml" << "NoSuchStyle" << "" << "Default";
+    // Action.qml exists in the "data" style and the Basic style.
+    QTest::newRow("control=Action,style=empty,fallback=empty") << "Action.qml" << "" << "" << "Basic";
+    QTest::newRow("control=Action,style=fs,fallback=empty") << "Action.qml" << "FileSystemStyle" << "" << "Basic";
+    QTest::newRow("control=Action,style=qrc,fallback=empty") << "Action.qml" << "ResourceStyle" << "" << "Basic";
+    QTest::newRow("control=Action,style=nosuch,fallback=empty") << "Action.qml" << "NoSuchStyle" << "" << "Basic";
     QTest::newRow("control=Action,style=data,fallback=empty") << "Action.qml" << "data" << "" << "data";
 
     QTest::newRow("control=Action,style=empty,fallback=mat") << "Action.qml" << "" << "Material" << "";
-    QTest::newRow("control=Action,style=fs,fallback=mat") << "Action.qml" << "FileSystemStyle" << "Material" << "Default";
-    QTest::newRow("control=Action,style=qrc,fallback=mat") << "Action.qml" << "ResourceStyle" << "Material" << "Default";
-    QTest::newRow("control=Action,style=nosuch,fallback=mat") << "Action.qml" << "NoSuchStyle" << "Material" << "Default";
+    QTest::newRow("control=Action,style=fs,fallback=mat") << "Action.qml" << "FileSystemStyle" << "Material" << "Basic";
+    QTest::newRow("control=Action,style=qrc,fallback=mat") << "Action.qml" << "ResourceStyle" << "Material" << "Basic";
+    QTest::newRow("control=Action,style=nosuch,fallback=mat") << "Action.qml" << "NoSuchStyle" << "Material" << "Basic";
     QTest::newRow("control=Action,style=data,fallback=mat") << "Action.qml" << "data" << "Material" << "data";
 
-    // ScrollView.qml only exists in the Default style.
-    QTest::newRow("control=ScrollView,style=empty,fallback=empty") << "ScrollView.qml" << "" << "" << "Default";
-    QTest::newRow("control=ScrollView,style=fs,fallback=empty") << "ScrollView.qml" << "FileSystemStyle" << "" << "Default";
-    QTest::newRow("control=ScrollView,style=qrc,fallback=empty") << "ScrollView.qml" << "ResourceStyle" << "" << "Default";
-    QTest::newRow("control=ScrollView,style=nosuch,fallback=empty") << "ScrollView.qml" << "NoSuchStyle" << "" << "Default";
-    QTest::newRow("control=ScrollView,style=data,fallback=empty") << "ScrollView.qml" << "data" << "" << "Default";
-
-    QTest::newRow("control=ScrollView,style=empty,fallback=mat") << "ScrollView.qml" << "" << "Material" << "Default";
-    QTest::newRow("control=ScrollView,style=fs,fallback=mat") << "ScrollView.qml" << "FileSystemStyle" << "Material" << "Default";
-    QTest::newRow("control=ScrollView,style=qrc,fallback=mat") << "ScrollView.qml" << "ResourceStyle" << "Material" << "Default";
-    QTest::newRow("control=ScrollView,style=nosuch,fallback=mat") << "ScrollView.qml" << "NoSuchStyle" << "Material" << "Default";
-    QTest::newRow("control=ScrollView,style=data,fallback=mat") << "ScrollView.qml" << "data" << "Material" << "Default";
-
-    // Label.qml exists in the "data", Default and Material styles.
-    QTest::newRow("control=Label,style=none,fallback=none") << "Label.qml" << "" << "" << "Default";
-    QTest::newRow("control=Label,style=fs,fallback=none") << "Label.qml" << "FileSystemStyle" << "" << "Default";
-    QTest::newRow("control=Label,style=qrc,fallback=none") << "Label.qml" << "ResourceStyle" << "" << "Default";
-    QTest::newRow("control=Label,style=nosuch,fallback=none") << "Label.qml" << "NoSuchStyle" << "" << "Default";
+    // ScrollView.qml only exists in the Basic style.
+    QTest::newRow("control=ScrollView,style=empty,fallback=empty") << "ScrollView.qml" << "" << "" << "Basic";
+    QTest::newRow("control=ScrollView,style=fs,fallback=empty") << "ScrollView.qml" << "FileSystemStyle" << "" << "Basic";
+    QTest::newRow("control=ScrollView,style=qrc,fallback=empty") << "ScrollView.qml" << "ResourceStyle" << "" << "Basic";
+    QTest::newRow("control=ScrollView,style=nosuch,fallback=empty") << "ScrollView.qml" << "NoSuchStyle" << "" << "Basic";
+    QTest::newRow("control=ScrollView,style=data,fallback=empty") << "ScrollView.qml" << "data" << "" << "Basic";
+
+    QTest::newRow("control=ScrollView,style=empty,fallback=mat") << "ScrollView.qml" << "" << "Material" << "Basic";
+    QTest::newRow("control=ScrollView,style=fs,fallback=mat") << "ScrollView.qml" << "FileSystemStyle" << "Material" << "Basic";
+    QTest::newRow("control=ScrollView,style=qrc,fallback=mat") << "ScrollView.qml" << "ResourceStyle" << "Material" << "Basic";
+    QTest::newRow("control=ScrollView,style=nosuch,fallback=mat") << "ScrollView.qml" << "NoSuchStyle" << "Material" << "Basic";
+    QTest::newRow("control=ScrollView,style=data,fallback=mat") << "ScrollView.qml" << "data" << "Material" << "Basic";
+
+    // Label.qml exists in the "data", Basic and Material styles.
+    QTest::newRow("control=Label,style=none,fallback=none") << "Label.qml" << "" << "" << "Basic";
+    QTest::newRow("control=Label,style=fs,fallback=none") << "Label.qml" << "FileSystemStyle" << "" << "Basic";
+    QTest::newRow("control=Label,style=qrc,fallback=none") << "Label.qml" << "ResourceStyle" << "" << "Basic";
+    QTest::newRow("control=Label,style=nosuch,fallback=none") << "Label.qml" << "NoSuchStyle" << "" << "Basic";
     QTest::newRow("control=Label,style=data,fallback=none") << "Label.qml" << "data" << "" << "data";
 
-    QTest::newRow("control=Label,style=none,fallback=mat") << "Label.qml" << "" << "Material" << "Default";
-    QTest::newRow("control=Label,style=fs,fallback=mat") << "Label.qml" << "FileSystemStyle" << "Material" << "Default";
-    QTest::newRow("control=Label,style=qrc,fallback=mat") << "Label.qml" << "ResourceStyle" << "Material" << "Default";
-    QTest::newRow("control=Label,style=nosuch,fallback=mat") << "Label.qml" << "NoSuchStyle" << "Material" << "Default";
+    QTest::newRow("control=Label,style=none,fallback=mat") << "Label.qml" << "" << "Material" << "Basic";
+    QTest::newRow("control=Label,style=fs,fallback=mat") << "Label.qml" << "FileSystemStyle" << "Material" << "Basic";
+    QTest::newRow("control=Label,style=qrc,fallback=mat") << "Label.qml" << "ResourceStyle" << "Material" << "Basic";
+    QTest::newRow("control=Label,style=nosuch,fallback=mat") << "Label.qml" << "NoSuchStyle" << "Material" << "Basic";
     QTest::newRow("control=Label,style=data,fallback=mat") << "Label.qml" << "data" << "Material" << "data";
 
     // Button.qml exists in all styles including the fs and qrc styles
-    QTest::newRow("control=Button,style=none,fallback=none") << "Button.qml" << "" << "" << "Default";
+    QTest::newRow("control=Button,style=none,fallback=none") << "Button.qml" << "" << "" << "Basic";
     QTest::newRow("control=Button,style=fs,fallback=none") << "Button.qml" << "FileSystemStyle" << "" << "FileSystemStyle";
     QTest::newRow("control=Button,style=qrc,fallback=none") << "Button.qml" << "ResourceStyle" << "" << "ResourceStyle";
-    QTest::newRow("control=Button,style=nosuch,fallback=none") << "Button.qml" << "NoSuchStyle" << "" << "Default";
+    QTest::newRow("control=Button,style=nosuch,fallback=none") << "Button.qml" << "NoSuchStyle" << "" << "Basic";
     QTest::newRow("control=Button,style=data,fallback=none") << "Button.qml" << "data" << "" << "data";
 
-    QTest::newRow("control=Button,style=none,fallback=mat") << "Button.qml" << "" << "Material" << "Default";
+    QTest::newRow("control=Button,style=none,fallback=mat") << "Button.qml" << "" << "Material" << "Basic";
     QTest::newRow("control=Button,style=fs,fallback=mat") << "Button.qml" << "FileSystemStyle" << "Material" << "FileSystemStyle";
     QTest::newRow("control=Button,style=qrc,fallback=mat") << "Button.qml" << "ResourceStyle" << "Material" << "ResourceStyle";
-    QTest::newRow("control=Button,style=nosuch,fallback=mat") << "Button.qml" << "NoSuchStyle" << "Material" << "Default";
+    QTest::newRow("control=Button,style=nosuch,fallback=mat") << "Button.qml" << "NoSuchStyle" << "Material" << "Basic";
     QTest::newRow("control=Button,style=data,fallback=mat") << "Button.qml" << "data" << "Material" << "data";
 }
 
@@ -227,12 +227,12 @@ void tst_StyleImports::importStyleWithoutControls()
     bool success = false;
 
     // Account for extra warnings for fallback styles.
-    QTest::ignoreMessage(QtWarningMsg, QRegularExpression("QtQuick.Controls must be imported before importing.*Default"));
+    QTest::ignoreMessage(QtWarningMsg, QRegularExpression("QtQuick.Controls must be imported before importing.*Basic"));
     if (style == QLatin1String("macOS"))
         QTest::ignoreMessage(QtWarningMsg, QRegularExpression("QtQuick.Controls must be imported before importing.*Fusion"));
 
     // Account for the warning for the current style.
-    if (style != QLatin1String("Default"))
+    if (style != QLatin1String("Basic"))
         QTest::ignoreMessage(QtWarningMsg, QRegularExpression("QtQuick.Controls must be imported before importing.*" + style));
 
     QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp
index d186dc83..87869bca 100644
--- a/tests/benchmarks/creationtime/tst_creationtime.cpp
+++ b/tests/benchmarks/creationtime/tst_creationtime.cpp
@@ -51,8 +51,8 @@ private slots:
     void initTestCase();
     void init();
 
-    void defaultStyle();
-    void defaultStyle_data();
+    void basicStyle();
+    void basicStyle_data();
 
     void fusion();
     void fusion_data();
@@ -102,16 +102,16 @@ static void doBenchmark(QQuickStyleHelper &styleHelper, const QUrl &url)
     qDeleteAll(objects);
 }
 
-void tst_CreationTime::defaultStyle()
+void tst_CreationTime::basicStyle()
 {
     QFETCH(QUrl, url);
     doBenchmark(styleHelper, url);
 }
 
-void tst_CreationTime::defaultStyle_data()
+void tst_CreationTime::basicStyle_data()
 {
     QTest::addColumn<QUrl>("url");
-    addTestRowForEachControl(styleHelper.engine.data(), "controls/default", "QtQuick/Controls/Default", QStringList() << "ApplicationWindow");
+    addTestRowForEachControl(styleHelper.engine.data(), "controls/basic", "QtQuick/Controls/Basic", QStringList() << "ApplicationWindow");
 }
 
 void tst_CreationTime::fusion()
diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp
index 626bb572..cd8b4aee 100644
--- a/tests/benchmarks/objectcount/tst_objectcount.cpp
+++ b/tests/benchmarks/objectcount/tst_objectcount.cpp
@@ -93,7 +93,7 @@ void tst_ObjectCount::cleanup()
 
 static void initTestRows(QQmlEngine *engine)
 {
-    addTestRowForEachControl(engine, "controls/default", "QtQuick/Controls/Default");
+    addTestRowForEachControl(engine, "controls/basic", "QtQuick/Controls/Basic");
     addTestRowForEachControl(engine, "controls/fusion", "QtQuick/Controls/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
     addTestRowForEachControl(engine, "controls/imagine", "QtQuick/Controls/Imagine");
     addTestRowForEachControl(engine, "controls/material", "QtQuick/Controls/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate");
diff --git a/tests/manual/dialogs/qtquickcontrols2.conf b/tests/manual/dialogs/qtquickcontrols2.conf
index 7ac31807..53f380bf 100644
--- a/tests/manual/dialogs/qtquickcontrols2.conf
+++ b/tests/manual/dialogs/qtquickcontrols2.conf
@@ -1,5 +1,5 @@
 [Controls]
-Style=Default
+Style=Basic
 ;Style=Fusion
 ;Style=Imagine
 ;Style=Material
diff --git a/tests/manual/nativestyle/CustomCheckBoxes.qml b/tests/manual/nativestyle/CustomCheckBoxes.qml
index ce3a5543..00dc7378 100644
--- a/tests/manual/nativestyle/CustomCheckBoxes.qml
+++ b/tests/manual/nativestyle/CustomCheckBoxes.qml
@@ -76,7 +76,7 @@ ControlContainer {
                     defaultColor: "#353637"
                     scale: 0.5
                     color: "green"
-                    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: customIndicator.checkState === Qt.Checked
                 }
 
@@ -119,7 +119,7 @@ ControlContainer {
                     defaultColor: "#353637"
                     scale: 0.5
                     color: "green"
-                    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: allCustom.checkState === Qt.Checked
                 }
 
diff --git a/tests/manual/nativestyle/CustomComboBoxes.qml b/tests/manual/nativestyle/CustomComboBoxes.qml
index bd793e28..a51cca94 100644
--- a/tests/manual/nativestyle/CustomComboBoxes.qml
+++ b/tests/manual/nativestyle/CustomComboBoxes.qml
@@ -61,7 +61,7 @@ ControlContainer {
                 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
             }
         }
@@ -100,7 +100,7 @@ ControlContainer {
                 y: control2.topPadding + (control2.availableHeight - height) / 2
                 color: control2.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/tests/manual/nativestyle/CustomDials.qml b/tests/manual/nativestyle/CustomDials.qml
index cc16e96f..b0df77b6 100644
--- a/tests/manual/nativestyle/CustomDials.qml
+++ b/tests/manual/nativestyle/CustomDials.qml
@@ -36,7 +36,7 @@
 
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.Default.impl
+import QtQuick.Controls.Basic.impl
 import QtQuick.Layouts
 
 ControlContainer {
@@ -68,7 +68,7 @@ ControlContainer {
                 width: 14
                 height: 10
                 color: "green"
-                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: dial1.enabled ? 1 : 0.3
                 transform: [
diff --git a/tests/manual/nativestyle/CustomProgressBars.qml b/tests/manual/nativestyle/CustomProgressBars.qml
index b7617f92..6ace8f20 100644
--- a/tests/manual/nativestyle/CustomProgressBars.qml
+++ b/tests/manual/nativestyle/CustomProgressBars.qml
@@ -37,7 +37,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import QtQuick.Controls.Default.impl
+import QtQuick.Controls.Basic.impl
 
 ControlContainer {
     id: container
diff --git a/tests/manual/nativestyle/main.cpp b/tests/manual/nativestyle/main.cpp
index 4925efa8..b064dd96 100644
--- a/tests/manual/nativestyle/main.cpp
+++ b/tests/manual/nativestyle/main.cpp
@@ -42,10 +42,8 @@ int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
 
-    // Todo: rename the "default" style to e.g "simple"
-    // and use "default" as a phony style name instad
-    // to mean "get me the default style on the current
-    // platform".
+    // TODO: when no style is specified, default to the appropriate native
+    // platform style if available, otherwise use Basic: QTBUG-86403
     const QString style = qEnvironmentVariable("DESKTOPGALLERY_STYLE");
     if (!style.isEmpty())
         QQuickStyle::setStyle(style);
diff --git a/tests/manual/styles-cover-flow/styles-cover-flow.qml b/tests/manual/styles-cover-flow/styles-cover-flow.qml
index ec9630cd..0f400c0d 100644
--- a/tests/manual/styles-cover-flow/styles-cover-flow.qml
+++ b/tests/manual/styles-cover-flow/styles-cover-flow.qml
@@ -74,7 +74,7 @@ Window {
         anchors.leftMargin: 130
         anchors.rightMargin: 130
         model: ListModel {
-            ListElement { source: "qtquickcontrols2-default.png"; dark: false }
+            ListElement { source: "qtquickcontrols2-basic.png"; dark: false }
             ListElement { source: "qtquickcontrols2-fusion.png"; dark: false }
             ListElement { source: "qtquickcontrols2-universal-light.png"; dark: false }
             ListElement { source: "qtquickcontrols2-universal-dark.png"; dark: true }