summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-07-14 15:27:35 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-07-22 10:27:48 +0000
commite9d822943a0c1b4f8a871b7e1a05b4f8ea93cd2a (patch)
treec4999fb0051628ff6505ea4a3107d983a663653e
parent78872375c2f07a176491ce4bebf26108c6604ab5 (diff)
add missing "enable" field to openssl feature
this ensures that an explicitly requested linked/runtime support is complained about when the test fails. the old configure would do that as well. Change-Id: I7f235fa7df5e5d53938de0e32b07536447b8d1d4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--configure.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.json b/configure.json
index 9f9651924f..ed8560d460 100644
--- a/configure.json
+++ b/configure.json
@@ -1609,6 +1609,7 @@
},
"openssl": {
"description": "OpenSSL",
+ "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'",
"condition": "!features.securetransport && tests.openssl",
"output": [
{ "type": "publicQtConfig", "condition": "!features.openssl-linked" },