From 4c52dd43ae69659f5b838448817d8f47ad61df21 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 31 Aug 2021 13:20:36 +0200 Subject: Fix QMAKE_LIBS_OPENSSL/NOLINK entries in qt_lib_network_private.pri The file qt_lib_network_private.pri contained the following bit QMAKE_LIBS_OPENSSL/NOLINK = QMAKE_INCDIR_OPENSSL/NOLINK = C:/openssl/include QMAKE_LIBS_OPENSSL = QMAKE_LIBS_OPENSSL_DEBUG = -L"C:/openssl/lib/VC" -llibssl64MDd QMAKE_LIBS_OPENSSL_RELEASE = -L"C:/openssl/lib/VC" -llibssl64MD QMAKE_INCDIR_OPENSSL = C:/openssl/include The /NOLINK entries are nonsense. QMake projects that do QMAKE_USE += openssl/nolink would use QMAKE_INCDIR_OPENSSL and discard the QMAKE_LIBS_OPENSSL* variables. The QMAKE_*_OPENSSL/NOLINK entries stem from the WrapOpenSSLHeaders CMake package, and QMAKE_*_OPENSSL from WrapOpenSSL. It's safe to assume that both packages use the same include paths. Remove the QMAKE_LIB parameter from the qt_find_package(WrapOpenSSLHeaders) call to avoid writing this library into the .pri file. Pick-to: 6.2 Fixes: QTBUG-89562 Change-Id: Ibc20f6f90678eb127db7813eb63c5c3e0bff2268 Reviewed-by: Alexandru Croitor --- src/network/configure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/network') diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 37f17ad4bd..9e2cb41c3b 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -8,7 +8,7 @@ qt_find_package(WrapBrotli PROVIDED_TARGETS WrapBrotli::WrapBrotliDec MODULE_NAME network QMAKE_LIB brotli) qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy MODULE_NAME network QMAKE_LIB libproxy) -qt_find_package(WrapOpenSSLHeaders PROVIDED_TARGETS WrapOpenSSLHeaders::WrapOpenSSLHeaders MODULE_NAME network QMAKE_LIB openssl/nolink) +qt_find_package(WrapOpenSSLHeaders PROVIDED_TARGETS WrapOpenSSLHeaders::WrapOpenSSLHeaders MODULE_NAME network) # openssl_headers qt_config_compile_test(openssl_headers LIBRARIES -- cgit v1.2.3