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>

3 files changed, 21 insertions, 21 deletions

diff --git a/src/quickcontrols2/configure.cmake b/src/quickcontrols2/configure.cmake
index c17574eb..f996cf28 100644
--- a/src/quickcontrols2/configure.cmake
+++ b/src/quickcontrols2/configure.cmake
@@ -14,49 +14,49 @@
 
 #### Features
 
-qt_feature("quickcontrols2-default" PRIVATE
-    LABEL "Default"
+qt_feature("quickcontrols2-basic" PRIVATE
+    LABEL "Basic"
 )
 qt_feature("quickcontrols2-fusion" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "Fusion"
     PURPOSE "Provides the platform agnostic desktop-oriented Fusion style."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_feature("quickcontrols2-imagine" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "Imagine"
     PURPOSE "Provides a style based on configurable image assets."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_feature("quickcontrols2-material" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "Material"
     PURPOSE "Provides a style based on the Material Design guidelines."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_feature("quickcontrols2-universal" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "Universal"
     PURPOSE "Provides a style based on the Universal Design guidelines."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_feature("quickcontrols2-macos" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "macOS"
     PURPOSE "Provides a native macOS desktop style."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_feature("quickcontrols2-windows" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "Windows"
     PURPOSE "Provides a native Windows desktop style."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_configure_add_summary_section(NAME "Qt Quick Controls 2")
 qt_configure_add_summary_entry(
     TYPE "featureList"
-    ARGS "quickcontrols2-default quickcontrols2-fusion quickcontrols2-imagine quickcontrols2-material quickcontrols2-universal quickcontrols2-macos quickcontrols2-windows"
+    ARGS "quickcontrols2-basic quickcontrols2-fusion quickcontrols2-imagine quickcontrols2-material quickcontrols2-universal quickcontrols2-macos quickcontrols2-windows"
     MESSAGE "Styles"
 )
 qt_configure_end_summary_section() # end of "Qt Quick Controls 2" section
diff --git a/src/quickcontrols2/configure.json b/src/quickcontrols2/configure.json
index 490b9cdf..ffefe17a 100644
--- a/src/quickcontrols2/configure.json
+++ b/src/quickcontrols2/configure.json
@@ -13,50 +13,50 @@
     },
 
     "features": {
-        "quickcontrols2-default": {
-            "label": "Default",
+        "quickcontrols2-basic": {
+            "label": "Basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-fusion": {
             "label": "Fusion",
             "purpose": "Provides the platform agnostic desktop-oriented Fusion style.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-imagine": {
             "label": "Imagine",
             "purpose": "Provides a style based on configurable image assets.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-material": {
             "label": "Material",
             "purpose": "Provides a style based on the Material Design guidelines.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-universal": {
             "label": "Universal",
             "purpose": "Provides a style based on the Universal Design guidelines.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-macos": {
             "label": "macOS",
             "purpose": "Provides a native macOS desktop style.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-windows": {
             "label": "Windows",
             "purpose": "Provides a native Windows desktop style.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         }
     },
@@ -68,7 +68,7 @@
                 {
                     "message": "Styles",
                     "type": "featureList",
-                    "args": "quickcontrols2-default quickcontrols2-fusion quickcontrols2-imagine quickcontrols2-material quickcontrols2-universal quickcontrols2-macos quickcontrols2-windows"
+                    "args": "quickcontrols2-basic quickcontrols2-fusion quickcontrols2-imagine quickcontrols2-material quickcontrols2-universal quickcontrols2-macos quickcontrols2-windows"
                 }
             ]
         }
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index ec0b5e48..d5ded6c2 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -93,7 +93,7 @@ Q_LOGGING_CATEGORY(lcQtQuickControlsStyle, "qt.quick.controls.style")
 
     To create your own custom style, see \l {Creating a Custom Style}. Custom
     styles do not need to implement all controls. By default, the styling
-    system uses the \l {Default style} as a fallback for controls that a custom
+    system uses the \l {Basic style} as a fallback for controls that a custom
     style does not provide. It is possible to specify a different fallback
     style to customize or extend one of the built-in styles.
 
@@ -238,7 +238,7 @@ Q_GLOBAL_STATIC(QQuickStyleSpec, styleSpec)
 
 QString QQuickStylePrivate::effectiveStyleName(const QString &styleName)
 {
-    return !styleName.isEmpty() ? styleName : QLatin1String("Default");
+    return !styleName.isEmpty() ? styleName : QLatin1String("Basic");
 }
 
 QString QQuickStylePrivate::fallbackStyle()
@@ -383,7 +383,7 @@ bool QQuickStylePrivate::isDarkSystemTheme()
 QStringList QQuickStylePrivate::builtInStyles()
 {
     return {
-        QLatin1String("Default"),
+        QLatin1String("Basic"),
         QLatin1String("Fusion"),
         QLatin1String("Imagine"),
 #ifdef Q_OS_MACOS