From 5485a085e6d9af34a2ce0b86abf91b0b693b9d05 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 13 Jul 2018 18:56:22 +0200
Subject: [PATCH] configure: optimize the openssl feature structure

don't run the openssl_headers test pointlessly when openssl-linked is
selected but its test fails. implementing this cleanly required creating
a separate openssl-runtime feature, including 'redirecting' the -openssl
option (which is just an alias for -openssl-runtime) to it.

simplify the openssl-linked conditions: while "anything but the value
that enables it" in the 'disable' field effectively means "don't
auto-detect it", it's better to be explicit about that.

Change-Id: I6b117cc50711bb64d090fcfdb89ff009c60ed86c
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/network/configure.json | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/network/configure.json b/src/network/configure.json
index 01ed1249e0..3f1cb7893b 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -195,20 +195,24 @@
         },
         "openssl": {
             "label": "OpenSSL",
-            "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'",
-            "disable": "input.openssl == 'no' || input.ssl == 'no'",
-            "autoDetect": "!config.winrt && !config.wasm",
-            "condition": "!features.securetransport && (features.openssl-linked || libs.openssl_headers)",
+            "enable": "false",
+            "condition": "features.openssl-runtime || features.openssl-linked",
             "output": [
                 "privateFeature",
                 { "type": "publicQtConfig", "condition": "!features.openssl-linked" },
                 { "type": "define", "negative": true, "name": "QT_NO_OPENSSL" }
             ]
         },
+        "openssl-runtime": {
+            "autoDetect": "!config.winrt && !config.wasm",
+            "enable": "input.openssl == 'yes' || input.openssl == 'runtime'",
+            "disable": "input.openssl == 'no' || input.openssl == 'linked' || input.ssl == 'no'",
+            "condition": "!features.securetransport && libs.openssl_headers"
+        },
         "openssl-linked": {
             "label": "  Qt directly linked to OpenSSL",
+            "autoDetect": false,
             "enable": "input.openssl == 'linked'",
-            "disable": "input.openssl != 'linked'",
             "condition": "!features.securetransport && libs.openssl",
             "output": [
                 "privateFeature",