diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-02-01 16:12:49 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-02-03 08:43:10 +0000 |
| commit | e365993b72d64db441f3940d6c255e3dbb2ad76a (patch) | |
| tree | c36f04de2c472b87da912cb12a0530e161cc9460 /src | |
| parent | 15ae7949661c6d7f401c83af5bdbb63a2ec46a2a (diff) | |
Fix configure.json for opensslv11 feature
Both the test/feature had some errors (incorrect
"use" and incomplete "condition") + remove "feature".
Task-number: QTBUG-62733
Change-Id: If4b8d2fe080d8fba961231834839afadaed0f0c5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/configure.json | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/network/configure.json b/src/network/configure.json index 770921f9a6..2f446becf1 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -123,10 +123,10 @@ "use": "network" }, "openssl11": { - "label": "OpenSSL v. 1.1 support", + "label": "OpenSSL 1.1 support", "type": "compile", "test": "unix/openssl11", - "use": "network" + "use": "openssl" } }, @@ -190,9 +190,9 @@ "output": [ "publicFeature", "feature" ] }, "opensslv11": { - "label": "OpenSSL v. 1.1", - "condition": "tests.openssl11", - "output": ["publicFeature", "feature"] + "label": "OpenSSL 1.1", + "condition": "features.openssl && tests.openssl11", + "output": [ "publicFeature" ] }, "sctp": { "label": "SCTP", @@ -307,6 +307,7 @@ For example: }, "openssl", "openssl-linked", + "opensslv11", "sctp", "system-proxies" ] |