From c9a96928307c1f6012d731e3a47979ca73203fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 1 Jun 2021 10:14:09 +0200 Subject: Fix inclusion of Qt6Network plugins in static builds The generated CMake file Config.cmake in cmake/Qt6Network/ is generated from the target name. If it doesn't end with "Plugin", then it won't be found by Qt6NetworkPlugins.cmake, which is looking for Qt6*PluginConfig.cmake files. Fixes: QTBUG-94108 Change-Id: I43f7056b2caede14509c9ec66b10e2037033762b Reviewed-by: Alexandru Croitor --- src/plugins/networkinformationbackends/android/CMakeLists.txt | 6 +++--- .../networklistmanager/CMakeLists.txt | 2 +- .../networkinformationbackends/networkmanager/CMakeLists.txt | 2 +- .../scnetworkreachability/CMakeLists.txt | 2 +- src/plugins/tls/certonly/CMakeLists.txt | 3 ++- src/plugins/tls/openssl/CMakeLists.txt | 10 +++++----- src/plugins/tls/schannel/CMakeLists.txt | 2 +- src/plugins/tls/securetransport/CMakeLists.txt | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/networkinformationbackends/android/CMakeLists.txt b/src/plugins/networkinformationbackends/android/CMakeLists.txt index a53fa9a1ea..6c48b3ff49 100644 --- a/src/plugins/networkinformationbackends/android/CMakeLists.txt +++ b/src/plugins/networkinformationbackends/android/CMakeLists.txt @@ -14,7 +14,7 @@ install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend COMPONENT Devel ) -qt_internal_add_plugin(QAndroidNetworkInformationBackend +qt_internal_add_plugin(QAndroidNetworkInformationBackendPlugin OUTPUT_NAME androidnetworkinformationbackend CLASS_NAME QAndroidNetworkInformationBackendFactory TYPE networkinformationbackends @@ -30,14 +30,14 @@ qt_internal_add_plugin(QAndroidNetworkInformationBackend set_property( TARGET - QAndroidNetworkInformationBackend + QAndroidNetworkInformationBackendPlugin APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES jar/Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend.jar ) set_property( TARGET - QAndroidNetworkInformationBackend + QAndroidNetworkInformationBackendPlugin APPEND PROPERTY QT_ANDROID_PERMISSIONS android.permission.ACCESS_NETWORK_STATE ) diff --git a/src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt b/src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt index 363f22e18b..a932f51270 100644 --- a/src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt +++ b/src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_internal_add_plugin(QNetworkListManagerNetworkInformationBackend +qt_internal_add_plugin(QNetworkListManagerNetworkInformationBackendPlugin OUTPUT_NAME networklistmanagernetworkinformationbackend CLASS_NAME QNetworkListManagerNetworkInformationBackendFactory TYPE networkinformationbackends diff --git a/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt b/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt index c5fa1db526..2f5b5e9d4f 100644 --- a/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt +++ b/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_internal_add_plugin(QNetworkManagerNetworkInformationBackend +qt_internal_add_plugin(QNetworkManagerNetworkInformationBackendPlugin OUTPUT_NAME networkmanagernetworkinformationbackend CLASS_NAME QNetworkManagerNetworkInformationBackendFactory TYPE networkinformationbackends diff --git a/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt b/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt index e0b61fe141..9f8b9846b5 100644 --- a/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt +++ b/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationBackend +qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationBackendPlugin OUTPUT_NAME scnetworkreachabilitynetworkinformationbackend CLASS_NAME QSCNetworkReachabilityNetworkInformationBackendFactory TYPE networkinformationbackends diff --git a/src/plugins/tls/certonly/CMakeLists.txt b/src/plugins/tls/certonly/CMakeLists.txt index 8a1a5c0691..275045dc49 100644 --- a/src/plugins/tls/certonly/CMakeLists.txt +++ b/src/plugins/tls/certonly/CMakeLists.txt @@ -1,7 +1,8 @@ -qt_internal_add_plugin(QTlsBackendCertOnly +qt_internal_add_plugin(QTlsBackendCertOnlyPlugin OUTPUT_NAME certonlybackend CLASS_NAME QTlsBackendCertOnly TYPE tls + DEFAULT_IF NOT QT_FEATURE_securetransport AND NOT (QT_FEATURE_openssl OR QT_FEATURE_openssl_linked) AND NOT QT_FEATURE_schannel SOURCES ../shared/qx509_base_p.h ../shared/qx509_base.cpp diff --git a/src/plugins/tls/openssl/CMakeLists.txt b/src/plugins/tls/openssl/CMakeLists.txt index 3bcad2752e..266292c62a 100644 --- a/src/plugins/tls/openssl/CMakeLists.txt +++ b/src/plugins/tls/openssl/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_internal_add_plugin(QTlsBackendOpenSSL +qt_internal_add_plugin(QTlsBackendOpenSSLPlugin OUTPUT_NAME opensslbackend CLASS_NAME QTlsBackendOpenSSL TYPE tls @@ -21,13 +21,13 @@ qt_internal_add_plugin(QTlsBackendOpenSSL OPENSSL_API_COMPAT=0x10100000L ) -qt_internal_extend_target(QTlsBackendOpenSSL CONDITION QT_FEATURE_dtls +qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION QT_FEATURE_dtls SOURCES qdtls_openssl.cpp qdtls_openssl_p.h ../shared/qdtls_base.cpp ../shared/qdtls_base_p.h ) -qt_internal_extend_target(QTlsBackendOpenSSL CONDITION APPLE +qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION APPLE SOURCES ../shared/qsslsocket_mac_shared.cpp LIBRARIES @@ -35,12 +35,12 @@ qt_internal_extend_target(QTlsBackendOpenSSL CONDITION APPLE ${FWSecurity} ) -qt_internal_extend_target(QTlsBackendOpenSSL CONDITION ANDROID AND NOT ANDROID_EMBEDDED +qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION ANDROID AND NOT ANDROID_EMBEDDED SOURCES qsslsocket_openssl_android.cpp ) -qt_internal_extend_target(QTlsBackendOpenSSL CONDITION QT_FEATURE_openssl +qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 SOURCES qwindowscarootfetcher.cpp qwindowscarootfetcher_p.h diff --git a/src/plugins/tls/schannel/CMakeLists.txt b/src/plugins/tls/schannel/CMakeLists.txt index b038f6056e..9f347416a4 100644 --- a/src/plugins/tls/schannel/CMakeLists.txt +++ b/src/plugins/tls/schannel/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_internal_add_plugin(QSchannelBackend +qt_internal_add_plugin(QSchannelBackendPlugin OUTPUT_NAME schannelbackend CLASS_NAME QSchannelBackend TYPE tls diff --git a/src/plugins/tls/securetransport/CMakeLists.txt b/src/plugins/tls/securetransport/CMakeLists.txt index db9101f43c..6d86191879 100644 --- a/src/plugins/tls/securetransport/CMakeLists.txt +++ b/src/plugins/tls/securetransport/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_internal_add_plugin(QSecureTransportBackend +qt_internal_add_plugin(QSecureTransportBackendPlugin OUTPUT_NAME securetransportbackend CLASS_NAME QSecureTransportBackend TYPE tls -- cgit v1.2.3