diff options
| -rw-r--r-- | src/network/configure.cmake | 7 | ||||
| -rw-r--r-- | src/network/configure.json | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 6f3dac9faa..d66874b462 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -280,13 +280,14 @@ qt_feature_definition("openssl-linked" "QT_LINKED_OPENSSL") qt_feature("securetransport" PUBLIC LABEL "SecureTransport" CONDITION APPLE AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' ) - DISABLE INPUT_securetransport STREQUAL 'no' OR INPUT_ssl STREQUAL 'no' + DISABLE INPUT_ssl STREQUAL 'no' ) qt_feature_definition("securetransport" "QT_SECURETRANSPORT") qt_feature("schannel" PUBLIC LABEL "Schannel" - CONDITION INPUT_schannel STREQUAL 'yes' AND WIN32 AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' ) - DISABLE INPUT_schannel STREQUAL 'no' OR INPUT_ssl STREQUAL 'no' + AUTODETECT OFF + CONDITION WIN32 AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' ) + DISABLE INPUT_ssl STREQUAL 'no' ) qt_feature_definition("schannel" "QT_SCHANNEL") qt_feature("ssl" PUBLIC diff --git a/src/network/configure.json b/src/network/configure.json index 9a09d3f2e1..835e449e5d 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -304,7 +304,7 @@ }, "securetransport": { "label": "SecureTransport", - "disable": "input.securetransport == 'no' || input.ssl == 'no'", + "disable": "input.ssl == 'no'", "condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')", "output": [ "publicFeature", @@ -313,8 +313,9 @@ }, "schannel": { "label": "Schannel", - "disable": "input.schannel == 'no' || input.ssl == 'no'", - "condition": "input.schannel == 'yes' && config.win32 && (input.openssl == '' || input.openssl == 'no')", + "autoDetect": false, + "disable": "input.ssl == 'no'", + "condition": "config.win32 && (input.openssl == '' || input.openssl == 'no')", "output": [ "publicFeature", { "type": "define", "name": "QT_SCHANNEL" } |