From 98ddf9262e356178ddcf26b72e375c99cec16b79 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 27 Jun 2016 16:45:03 +0200
Subject: Revamp configure system for widget styles

Add [-no]-style-foo command line options for all widget styles, bringing
this closer in line with configure.exe. Add proper platform dependencies
and a configure test for the required uxtheme.h header on Windows. Clean
up and simplify styles.pri. Don't let configure.exe define QT_NO_STYLE_*
any more, as styles.pri does that locally anyway.

Change-Id: I81341f887a65b4e45e77380974eb79743acfad77
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 configure.json | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index b3749a6abf..0d8c73a639 100644
--- a/configure.json
+++ b/configure.json
@@ -169,6 +169,12 @@
             "ssse3": "boolean",
             "static": { "type": "enum", "name": "shared", "values": { "yes": "no", "no": "yes" } },
             "strip": "boolean",
+            "style-windows": "boolean",
+            "style-windowsxp": "boolean",
+            "style-windowsvista": "boolean",
+            "style-fusion": "boolean",
+            "style-mac": "boolean",
+            "style-android": "boolean",
             "syslog": "boolean",
             "sysroot": "string",
             "system-proxies": "boolean",
@@ -1170,6 +1176,11 @@
             "test": "win/directwrite2",
             "use": "directwrite"
         },
+        "uxtheme": {
+            "description": "uxtheme.h",
+            "type": "files",
+            "files": [ "uxtheme.h" ]
+        },
         "qpa_default_platform": {
             "description": "default QPA platform",
             "type": "qpaDefaultPlatform",
@@ -2287,36 +2298,37 @@
             "condition": "libs.tds",
             "output": [ "sqldriver" ]
         },
-        "fusion-style": {
+        "style-fusion": {
             "description": "Fusion Style",
             "output": [ "styles" ]
         },
-        "mac-style": {
+        "style-mac": {
             "description": "Mac Style",
+            "condition": "config.osx",
             "output": [ "styles" ]
         },
-        "windows-style": {
+        "style-windows": {
             "description": "Windows Style",
             "output": [ "styles" ]
         },
-        "windowsxp-style": {
+        "style-windowsxp": {
             "description": "Windows XP Style",
-            "condition": "config.win32",
+            "condition": "features.style-windows && config.win32 && !config.winrt && tests.uxtheme",
             "output": [ "styles" ]
         },
-        "windowsvista-style": {
+        "style-windowsvista": {
             "description": "Windows Vista Style",
-            "condition": "config.win32",
+            "condition": "features.style-windowsxp",
             "output": [ "styles" ]
         },
-        "android-style": {
+        "style-android": {
             "description": "Android Style",
-            "condition": "config.android",
+            "autoDetect": "config.android",
             "output": [ "styles" ]
         },
         "android-style-assets": {
             "description": "Android Style Assets",
-            "condition": "features.android-style",
+            "condition": "features.style-android",
             "output": [ "privateConfig" ]
         },
         "audio-backend": {
-- 
cgit v1.2.3