1 files changed, 23 insertions, 32 deletions

diff --git a/src/network/configure.cmake b/src/network/configure.cmake
index 1e2df486f4..9046464cf4 100644
--- a/src/network/configure.cmake
+++ b/src/network/configure.cmake
@@ -17,6 +17,7 @@ qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI)
 # getifaddrs
 qt_config_compile_test(getifaddrs
     LABEL "getifaddrs()"
+    CODE
 "
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -33,12 +34,13 @@ freeifaddrs(list);
     /* END TEST: */
     return 0;
 }
-"# FIXME: use: network
+"# FIXME: use: unmapped library: network
 )
 
 # ipv6ifname
 qt_config_compile_test(ipv6ifname
     LABEL "IPv6 ifname"
+    CODE
 "
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -55,12 +57,13 @@ if_freenameindex(if_nameindex());
     /* END TEST: */
     return 0;
 }
-"# FIXME: use: network
+"# FIXME: use: unmapped library: network
 )
 
 # linux-netlink
 qt_config_compile_test(linux_netlink
     LABEL "Linux AF_NETLINK sockets"
+    CODE
 "
 #include <asm/types.h>
 #include <linux/netlink.h>
@@ -88,6 +91,7 @@ ci.ifa_prefered = ci.ifa_valid = 0;
 # sctp
 qt_config_compile_test(sctp
     LABEL "SCTP support"
+    CODE
 "
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -105,31 +109,15 @@ socklen_t sctpInitMsgSize = sizeof(sctpInitMsg);
     /* END TEST: */
     return 0;
 }
-"# FIXME: use: network
-)
-
-# openssl11
-qt_config_compile_test(openssl11
-    LABEL "OpenSSL 1.1 support"
-"
-#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;
-}
-"# FIXME: use: openssl
+"# FIXME: use: unmapped library: network
 )
 
 # dtls
 qt_config_compile_test(dtls
     LABEL "DTLS support in OpenSSL"
+    LIBRARIES
+        OpenSSL::SSL
+    CODE
 "
 #include <openssl/ssl.h>
 #if defined(OPENSSL_NO_DTLS) || !defined(DTLS1_2_VERSION)
@@ -143,12 +131,14 @@ int main(int argc, char **argv)
     /* END TEST: */
     return 0;
 }
-"# FIXME: use: openssl
-)
+")
 
 # ocsp
 qt_config_compile_test(ocsp
     LABEL "OCSP stapling support in OpenSSL"
+    LIBRARIES
+        OpenSSL::SSL
+    CODE
 "
 #include <openssl/ssl.h>
 #include <openssl/ocsp.h>
@@ -163,12 +153,12 @@ int main(int argc, char **argv)
     /* END TEST: */
     return 0;
 }
-"# FIXME: use: openssl
-)
+")
 
 # netlistmgr
 qt_config_compile_test(netlistmgr
     LABEL "Network List Manager"
+    CODE
 "
 #include <netlistmgr.h>
 #include <wrl/client.h>
@@ -214,7 +204,7 @@ qt_feature("libproxy" PRIVATE
     AUTODETECT OFF
     CONDITION Libproxy_FOUND
 )
-qt_feature("linux_netlink" PRIVATE
+qt_feature("linux-netlink" PRIVATE
     LABEL "Linux AF_NETLINK"
     CONDITION LINUX AND TEST_linux_netlink
 )
@@ -224,19 +214,20 @@ qt_feature("openssl" PRIVATE
     ENABLE false
 )
 qt_feature_definition("openssl" "QT_NO_OPENSSL" NEGATE)
-qt_feature("openssl_runtime"
+qt_feature_config("openssl" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("openssl-runtime"
     AUTODETECT NOT WINRT AND NOT WASM
     CONDITION NOT QT_FEATURE_securetransport AND NOT QT_FEATURE_schannel AND OPENSSL_INCLUDE_DIR
     ENABLE INPUT_openssl STREQUAL 'yes' OR INPUT_openssl STREQUAL 'runtime'
     DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_openssl STREQUAL 'linked' OR INPUT_ssl STREQUAL 'no'
 )
-qt_feature("openssl_linked" PRIVATE
+qt_feature("openssl-linked" PRIVATE
     LABEL "  Qt directly linked to OpenSSL"
     AUTODETECT OFF
     CONDITION NOT QT_FEATURE_securetransport AND NOT QT_FEATURE_schannel AND OpenSSL_FOUND
     ENABLE INPUT_openssl STREQUAL 'linked'
 )
-qt_feature_definition("openssl_linked" "QT_LINKED_OPENSSL")
+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' )
@@ -268,7 +259,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"
@@ -276,7 +267,7 @@ qt_feature("sctp" PUBLIC
     CONDITION TEST_sctp
 )
 qt_feature_definition("sctp" "QT_NO_SCTP" NEGATE VALUE "1")
-qt_feature("system_proxies" PRIVATE
+qt_feature("system-proxies" PRIVATE
     LABEL "Use system proxies"
 )
 qt_feature("ftp" PUBLIC