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>
This commit is contained in:
parent
cda75ef27a
commit
c9a9692830
@ -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
|
||||
)
|
||||
|
@ -1,4 +1,4 @@
|
||||
qt_internal_add_plugin(QNetworkListManagerNetworkInformationBackend
|
||||
qt_internal_add_plugin(QNetworkListManagerNetworkInformationBackendPlugin
|
||||
OUTPUT_NAME networklistmanagernetworkinformationbackend
|
||||
CLASS_NAME QNetworkListManagerNetworkInformationBackendFactory
|
||||
TYPE networkinformationbackends
|
||||
|
@ -1,4 +1,4 @@
|
||||
qt_internal_add_plugin(QNetworkManagerNetworkInformationBackend
|
||||
qt_internal_add_plugin(QNetworkManagerNetworkInformationBackendPlugin
|
||||
OUTPUT_NAME networkmanagernetworkinformationbackend
|
||||
CLASS_NAME QNetworkManagerNetworkInformationBackendFactory
|
||||
TYPE networkinformationbackends
|
||||
|
@ -1,4 +1,4 @@
|
||||
qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationBackend
|
||||
qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationBackendPlugin
|
||||
OUTPUT_NAME scnetworkreachabilitynetworkinformationbackend
|
||||
CLASS_NAME QSCNetworkReachabilityNetworkInformationBackendFactory
|
||||
TYPE networkinformationbackends
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,4 +1,4 @@
|
||||
qt_internal_add_plugin(QSchannelBackend
|
||||
qt_internal_add_plugin(QSchannelBackendPlugin
|
||||
OUTPUT_NAME schannelbackend
|
||||
CLASS_NAME QSchannelBackend
|
||||
TYPE tls
|
||||
|
@ -1,4 +1,4 @@
|
||||
qt_internal_add_plugin(QSecureTransportBackend
|
||||
qt_internal_add_plugin(QSecureTransportBackendPlugin
|
||||
OUTPUT_NAME securetransportbackend
|
||||
CLASS_NAME QSecureTransportBackend
|
||||
TYPE tls
|
||||
|
Loading…
x
Reference in New Issue
Block a user