diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index feaef0b978..8910f3fece 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -392,13 +392,7 @@ qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND Q ssl/qsslsocket_openssl_android.cpp ) -qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi) - LIBRARIES - crypto_${CMAKE_SYSTEM_PROCESSOR} - ssl_${CMAKE_SYSTEM_PROCESSOR} -) - -qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID +qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl LIBRARIES WrapOpenSSL::WrapOpenSSL PRIVATE_MODULE_INTERFACE diff --git a/src/network/configure.json b/src/network/configure.json index 3234fa6474..7fe7e13762 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -108,10 +108,6 @@ "libs": "-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32", "condition": "config.msvc" }, - { - "libs": "-lssl_arm64-v8a -lcrypto_arm64-v8a", - "condition": "config.android" - }, { "libs": "-lssl -lcrypto", "condition": "!config.msvc" @@ -447,7 +443,7 @@ "report": [ { "type": "note", - "condition": "!config.android && features.openssl-linked && libs.openssl.source != 0 + "condition": "features.openssl-linked && libs.openssl.source != 0 && input.openssl.prefix == '' && input.openssl.libs == '' && input.openssl.libs.debug == ''", "message": "When linking against OpenSSL, you can override the default library names through OPENSSL_LIBS.