whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Timur Pocheptsov 2018-02-01 16:12:49 +01:00 committed by Frederik Gladhorn
parent 15ae794966
commit e365993b72
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/configure.json
View File

@ -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"
]