diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-06-01 10:14:09 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2021-06-04 17:48:34 +0200 |
| commit | c9a96928307c1f6012d731e3a47979ca73203fe8 (patch) | |
| tree | beddc2b2f8c7dc3429487244e79672afb5567c99 /src/plugins/tls | |
| parent | cda75ef27a53ad25ca00085601108536dfa556fe (diff) | |
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/tls')
| -rw-r--r-- | src/plugins/tls/certonly/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/tls/openssl/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/plugins/tls/schannel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/tls/securetransport/CMakeLists.txt | 2 |
4 files changed, 9 insertions, 8 deletions
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 |