From 5592204b19a5dc46e308cc31ac035edb78d2d8fd Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 27 Nov 2020 20:19:07 +0100 Subject: CMake: Fix QMAKE_LIB of WrapOpenSSLHeaders library The correct entry for this lib is 'openssl/nolink', not 'openssl_headers'. In configurejson2cmake's helper.py we already have this information encoded such that the no_link_so_name field of 'openssl' points to 'openssl_headers'. Extend configurejson2cmake to take this into account, and re-generate src/network/configure.cmake. Pick-to: 6.0 Change-Id: I9817ea7722503a373d309b7e6fa201448d403e8d Reviewed-by: Alexandru Croitor --- .prev_configure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.prev_configure.cmake') diff --git a/.prev_configure.cmake b/.prev_configure.cmake index 3390c85588..b0a133bcb3 100644 --- a/.prev_configure.cmake +++ b/.prev_configure.cmake @@ -643,7 +643,7 @@ qt_feature("enable_gdb_index" qt_feature_config("enable_gdb_index" QMAKE_PRIVATE_CONFIG) qt_feature("reduce_exports" PRIVATE LABEL "Reduce amount of exported symbols" - CONDITION NOT WIN32 AND CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY + CONDITION NOT MSVC ) qt_feature_definition("reduce_exports" "QT_VISIBILITY_AVAILABLE") qt_feature_config("reduce_exports" QMAKE_PUBLIC_QT_CONFIG) -- cgit v1.2.3