Merge remote-tracking branch 'nativestyle' into dev

Change-Id: I18a4fd46cf13c65fe6f4c3981b7c61ab52109b8d

3 files changed, 40 insertions, 5 deletions

diff --git a/src/quickcontrols2/configure.cmake b/src/quickcontrols2/configure.cmake
index 456b3e378b..c17574eb35 100644
--- a/src/quickcontrols2/configure.cmake
+++ b/src/quickcontrols2/configure.cmake
@@ -41,10 +41,22 @@ qt_feature("quickcontrols2-universal" PRIVATE
     PURPOSE "Provides a style based on the Universal Design guidelines."
     CONDITION QT_FEATURE_quickcontrols2_default
 )
+qt_feature("quickcontrols2-macos" PRIVATE
+    SECTION "Quick Controls 2"
+    LABEL "macOS"
+    PURPOSE "Provides a native macOS desktop style."
+    CONDITION QT_FEATURE_quickcontrols2_default
+)
+qt_feature("quickcontrols2-windows" PRIVATE
+    SECTION "Quick Controls 2"
+    LABEL "Windows"
+    PURPOSE "Provides a native Windows desktop style."
+    CONDITION QT_FEATURE_quickcontrols2_default
+)
 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"
+    ARGS "quickcontrols2-default 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 22a602d306..490b9cdf4e 100644
--- a/src/quickcontrols2/configure.json
+++ b/src/quickcontrols2/configure.json
@@ -6,7 +6,9 @@
             "style-fusion": { "type": "boolean", "name": "quickcontrols2-fusion" },
             "style-imagine": { "type": "boolean", "name": "quickcontrols2-imagine" },
             "style-material": { "type": "boolean", "name": "quickcontrols2-material" },
-            "style-universal": { "type": "boolean", "name": "quickcontrols2-universal" }
+            "style-universal": { "type": "boolean", "name": "quickcontrols2-universal" },
+            "style-macos": { "type": "boolean", "name": "quickcontrols2-macos" },
+            "style-windows": { "type": "boolean", "name": "quickcontrols2-windows" }
         }
     },
 
@@ -42,6 +44,20 @@
             "section": "Quick Controls 2",
             "condition": "features.quickcontrols2-default",
             "output": [ "privateFeature" ]
+        },
+        "quickcontrols2-macos": {
+            "label": "macOS",
+            "purpose": "Provides a native macOS desktop style.",
+            "section": "Quick Controls 2",
+            "condition": "features.quickcontrols2-default",
+            "output": [ "privateFeature" ]
+        },
+        "quickcontrols2-windows": {
+            "label": "Windows",
+            "purpose": "Provides a native Windows desktop style.",
+            "section": "Quick Controls 2",
+            "condition": "features.quickcontrols2-default",
+            "output": [ "privateFeature" ]
         }
     },
 
@@ -52,7 +68,7 @@
                 {
                     "message": "Styles",
                     "type": "featureList",
-                    "args": "quickcontrols2-default quickcontrols2-fusion quickcontrols2-imagine quickcontrols2-material quickcontrols2-universal"
+                    "args": "quickcontrols2-default 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 72078a0e00..3aab83376b 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -380,8 +380,15 @@ bool QQuickStylePrivate::isDarkSystemTheme()
 
 QStringList QQuickStylePrivate::builtInStyles()
 {
-    return { QLatin1String("Default"), QLatin1String("Fusion"),
-        QLatin1String("Imagine"), QLatin1String("Material"), QLatin1String("Universal") };
+    return {
+        QLatin1String("Default"),
+        QLatin1String("Fusion"),
+        QLatin1String("Imagine"),
+        QLatin1String("macOS"),
+        QLatin1String("Material"),
+        QLatin1String("Universal"),
+        QLatin1String("Windows")
+    };
 }
 
 /*!