Native style: add configure options

Change-Id: I54521f85aa821369ba3ff57fb037ae4996845c97
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

8 files changed, 37 insertions, 9 deletions

diff --git a/src/imports/controls/macos/CMakeLists.txt b/src/imports/controls/macos/CMakeLists.txt
index 76f87189..211d6871 100644
--- a/src/imports/controls/macos/CMakeLists.txt
+++ b/src/imports/controls/macos/CMakeLists.txt
@@ -39,6 +39,7 @@ qt_add_qml_module(qtquickcontrols2macosstyleplugin
 # QML_IMPORT_MAJOR_VERSION = "2"
 # QML_IMPORT_NAME = "QtQuick.Controls.macOS"
 # TARGETPATH = "QtQuick/Controls.2/macOS"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-macos)"
 
 set(qml_files
     "Button.qml"
diff --git a/src/imports/controls/macos/macos.pro b/src/imports/controls/macos/macos.pro
index 3ed55ef8..b8b2c19c 100644
--- a/src/imports/controls/macos/macos.pro
+++ b/src/imports/controls/macos/macos.pro
@@ -23,7 +23,6 @@ CONFIG += qmltypes install_qmltypes
 
 load(qml_plugin)
 
-# TODO: add config flag
-#requires(qtConfig(quickcontrols2-nativestyle))
+requires(qtConfig(quickcontrols2-macos))
 
 HEADERS +=
diff --git a/src/imports/controls/windows/CMakeLists.txt b/src/imports/controls/windows/CMakeLists.txt
index bede8e30..0470f370 100644
--- a/src/imports/controls/windows/CMakeLists.txt
+++ b/src/imports/controls/windows/CMakeLists.txt
@@ -39,6 +39,7 @@ qt_add_qml_module(qtquickcontrols2windowsstyleplugin
 # QML_IMPORT_MAJOR_VERSION = "6"
 # QML_IMPORT_NAME = "QtQuick.Controls.Windows"
 # TARGETPATH = "QtQuick/Controls.2/Windows"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-windows)"
 
 set(qml_files
     "Button.qml"
diff --git a/src/imports/controls/windows/windows.pro b/src/imports/controls/windows/windows.pro
index a19c2e79..d78690ec 100644
--- a/src/imports/controls/windows/windows.pro
+++ b/src/imports/controls/windows/windows.pro
@@ -23,7 +23,6 @@ CONFIG += qmltypes install_qmltypes
 
 load(qml_plugin)
 
-# TODO: add config flag
-#requires(qtConfig(quickcontrols2-nativestyle))
+requires(qtConfig(quickcontrols2-windows))
 
 HEADERS +=
diff --git a/src/imports/nativestyle/CMakeLists.txt b/src/imports/nativestyle/CMakeLists.txt
index 08c44e7f..ee972a3b 100644
--- a/src/imports/nativestyle/CMakeLists.txt
+++ b/src/imports/nativestyle/CMakeLists.txt
@@ -61,6 +61,7 @@ qt_add_qml_module(qtquickcontrols2nativestyleplugin
 # QML_IMPORT_MAJOR_VERSION = "6"
 # QML_IMPORT_NAME = "QtQuick.NativeStyle"
 # TARGETPATH = "QtQuick/NativeStyle"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-macos)|qtConfig(quickcontrols2-windows)"
 
 ## Scopes:
 #####################################################################
diff --git a/src/imports/nativestyle/nativestyle.pro b/src/imports/nativestyle/nativestyle.pro
index aa8b28b5..b06e5daf 100644
--- a/src/imports/nativestyle/nativestyle.pro
+++ b/src/imports/nativestyle/nativestyle.pro
@@ -25,7 +25,6 @@ CONFIG += qmltypes install_qmltypes
 
 load(qml_plugin)
 
-# TODO: add config flag
-#requires(qtConfig(quickcontrols2-nativestyle))
+requires(qtConfig(quickcontrols2-macos)|qtConfig(quickcontrols2-windows))
 
 HEADERS +=
diff --git a/src/quickcontrols2/configure.cmake b/src/quickcontrols2/configure.cmake
index 456b3e37..c17574eb 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 22a602d3..490b9cdf 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"
                 }
             ]
         }