diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-20 09:25:19 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 14:53:27 +0000 |
| commit | 1c655fb0fc08e89ab5efb23889266b710334f1a5 (patch) | |
| tree | ad0eae64bab5ffb902bf63bc88a98fed5cd1d83b /src/network/configure.cmake | |
| parent | bc1cae774ad8cc084a98cb37d363770efbde025c (diff) | |
Post merge fixes
Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/network/configure.cmake')
| -rw-r--r-- | src/network/configure.cmake | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 45c68ef4df..2e32149908 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -112,27 +112,6 @@ socklen_t sctpInitMsgSize = sizeof(sctpInitMsg); "# FIXME: use: unmapped library: network ) -# openssl11 -qt_config_compile_test(openssl11 - LABEL "OpenSSL 1.1 support" - LIBRARIES - OpenSSL::SSL - CODE -" -#include <openssl/opensslv.h> -#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L -# error OpenSSL >= 1.1 is required -#endif -int main(int argc, char **argv) -{ - (void)argc; (void)argv; - /* BEGIN TEST: */ - - /* END TEST: */ - return 0; -} -") - # dtls qt_config_compile_test(dtls LABEL "DTLS support in OpenSSL" @@ -279,7 +258,7 @@ qt_feature("ocsp" PUBLIC ) qt_feature("opensslv11" PUBLIC LABEL "OpenSSL 1.1" - CONDITION QT_FEATURE_openssl AND ( OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0" ) + CONDITION QT_FEATURE_openssl ) qt_feature("sctp" PUBLIC LABEL "SCTP" |