qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ssl handling in configure to be compatible with configure.exe 

Change-Id: I0fdd3aebaa9d2a4c68ee6ebc0b7a24868f3c2aa5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-07-04 10:44:39 +02:00
parent e23471abc0
commit c41dd40bff
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.json
View File

@ -162,6 +162,7 @@
"sse3": "boolean", "sse3": "boolean",
"sse4.1": { "type": "boolean", "name": "sse4_1" }, "sse4.1": { "type": "boolean", "name": "sse4_1" },
"sse4.2": { "type": "boolean", "name": "sse4_2" }, "sse4.2": { "type": "boolean", "name": "sse4_2" },
"ssl": "boolean",
"ssse3": "boolean", "ssse3": "boolean",
"static": { "type": "enum", "name": "shared", "values": { "yes": "no", "no": "yes" } }, "static": { "type": "enum", "name": "shared", "values": { "yes": "no", "no": "yes" } },
"strip": "boolean", "strip": "boolean",
@ -1600,6 +1601,7 @@
}, },
"securetransport": { "securetransport": {
"description": "SecureTransport", "description": "SecureTransport",
"disable": "input.securetransport == 'no' || input.ssl == 'no'",
"condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')", "condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')",
"output": [ "output": [
"publicQtConfig", "publicQtConfig",
@ -1609,6 +1611,7 @@
"openssl": { "openssl": {
"description": "OpenSSL", "description": "OpenSSL",
"enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'", "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'",
"disable": "input.openssl == 'no' || input.ssl == 'no'",
"condition": "!features.securetransport && tests.openssl", "condition": "!features.securetransport && tests.openssl",
"output": [ "output": [
{ "type": "publicQtConfig", "condition": "!features.openssl-linked" }, { "type": "publicQtConfig", "condition": "!features.openssl-linked" },