1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inclusion of Qt6Network plugins in static builds

Browse Source 
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:
Kai Köhne 2021-06-01 10:14:09 +02:00
parent cda75ef27a
commit c9a9692830
8 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/networkinformationbackends/android/CMakeLists.txt
View File

@ -14,7 +14,7 @@ install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend
COMPONENT Devel COMPONENT Devel
) )
qt_internal_add_plugin(QAndroidNetworkInformationBackend qt_internal_add_plugin(QAndroidNetworkInformationBackendPlugin
OUTPUT_NAME androidnetworkinformationbackend OUTPUT_NAME androidnetworkinformationbackend
CLASS_NAME QAndroidNetworkInformationBackendFactory CLASS_NAME QAndroidNetworkInformationBackendFactory
TYPE networkinformationbackends TYPE networkinformationbackends
@ -30,14 +30,14 @@ qt_internal_add_plugin(QAndroidNetworkInformationBackend
set_property( set_property(
TARGET TARGET
QAndroidNetworkInformationBackend QAndroidNetworkInformationBackendPlugin
APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
jar/Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend.jar jar/Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend.jar
) )
set_property( set_property(
TARGET TARGET
QAndroidNetworkInformationBackend QAndroidNetworkInformationBackendPlugin
APPEND PROPERTY QT_ANDROID_PERMISSIONS APPEND PROPERTY QT_ANDROID_PERMISSIONS
android.permission.ACCESS_NETWORK_STATE android.permission.ACCESS_NETWORK_STATE
) )

2
src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt
View File

@ -1,4 +1,4 @@
qt_internal_add_plugin(QNetworkListManagerNetworkInformationBackend qt_internal_add_plugin(QNetworkListManagerNetworkInformationBackendPlugin
OUTPUT_NAME networklistmanagernetworkinformationbackend OUTPUT_NAME networklistmanagernetworkinformationbackend
CLASS_NAME QNetworkListManagerNetworkInformationBackendFactory CLASS_NAME QNetworkListManagerNetworkInformationBackendFactory
TYPE networkinformationbackends TYPE networkinformationbackends

2
src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt
View File

@ -1,4 +1,4 @@
qt_internal_add_plugin(QNetworkManagerNetworkInformationBackend qt_internal_add_plugin(QNetworkManagerNetworkInformationBackendPlugin
OUTPUT_NAME networkmanagernetworkinformationbackend OUTPUT_NAME networkmanagernetworkinformationbackend
CLASS_NAME QNetworkManagerNetworkInformationBackendFactory CLASS_NAME QNetworkManagerNetworkInformationBackendFactory
TYPE networkinformationbackends TYPE networkinformationbackends

2
src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt
View File

@ -1,4 +1,4 @@
qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationBackend qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationBackendPlugin
OUTPUT_NAME scnetworkreachabilitynetworkinformationbackend OUTPUT_NAME scnetworkreachabilitynetworkinformationbackend
CLASS_NAME QSCNetworkReachabilityNetworkInformationBackendFactory CLASS_NAME QSCNetworkReachabilityNetworkInformationBackendFactory
TYPE networkinformationbackends TYPE networkinformationbackends

3
src/plugins/tls/certonly/CMakeLists.txt
View File

@ -1,7 +1,8 @@
qt_internal_add_plugin(QTlsBackendCertOnly qt_internal_add_plugin(QTlsBackendCertOnlyPlugin
OUTPUT_NAME certonlybackend OUTPUT_NAME certonlybackend
CLASS_NAME QTlsBackendCertOnly CLASS_NAME QTlsBackendCertOnly
TYPE tls TYPE tls
DEFAULT_IF NOT QT_FEATURE_securetransport AND NOT (QT_FEATURE_openssl OR QT_FEATURE_openssl_linked) AND NOT QT_FEATURE_schannel
SOURCES SOURCES
../shared/qx509_base_p.h ../shared/qx509_base_p.h
../shared/qx509_base.cpp ../shared/qx509_base.cpp

10
src/plugins/tls/openssl/CMakeLists.txt
View File

@ -1,4 +1,4 @@
qt_internal_add_plugin(QTlsBackendOpenSSL qt_internal_add_plugin(QTlsBackendOpenSSLPlugin
OUTPUT_NAME opensslbackend OUTPUT_NAME opensslbackend
CLASS_NAME QTlsBackendOpenSSL CLASS_NAME QTlsBackendOpenSSL
TYPE tls TYPE tls
@ -21,13 +21,13 @@ qt_internal_add_plugin(QTlsBackendOpenSSL
OPENSSL_API_COMPAT=0x10100000L OPENSSL_API_COMPAT=0x10100000L
) )
qt_internal_extend_target(QTlsBackendOpenSSL CONDITION QT_FEATURE_dtls qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION QT_FEATURE_dtls
SOURCES SOURCES
qdtls_openssl.cpp qdtls_openssl_p.h qdtls_openssl.cpp qdtls_openssl_p.h
../shared/qdtls_base.cpp ../shared/qdtls_base_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 SOURCES
../shared/qsslsocket_mac_shared.cpp ../shared/qsslsocket_mac_shared.cpp
LIBRARIES LIBRARIES
@ -35,12 +35,12 @@ qt_internal_extend_target(QTlsBackendOpenSSL CONDITION APPLE
${FWSecurity} ${FWSecurity}
) )
qt_internal_extend_target(QTlsBackendOpenSSL CONDITION ANDROID AND NOT ANDROID_EMBEDDED qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION ANDROID AND NOT ANDROID_EMBEDDED
SOURCES SOURCES
qsslsocket_openssl_android.cpp 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 AND QT_FEATURE_ssl AND WIN32
SOURCES SOURCES
qwindowscarootfetcher.cpp qwindowscarootfetcher_p.h qwindowscarootfetcher.cpp qwindowscarootfetcher_p.h

2
src/plugins/tls/schannel/CMakeLists.txt
View File

@ -1,4 +1,4 @@
qt_internal_add_plugin(QSchannelBackend qt_internal_add_plugin(QSchannelBackendPlugin
OUTPUT_NAME schannelbackend OUTPUT_NAME schannelbackend
CLASS_NAME QSchannelBackend CLASS_NAME QSchannelBackend
TYPE tls TYPE tls

2
src/plugins/tls/securetransport/CMakeLists.txt
View File

@ -1,4 +1,4 @@
qt_internal_add_plugin(QSecureTransportBackend qt_internal_add_plugin(QSecureTransportBackendPlugin
OUTPUT_NAME securetransportbackend OUTPUT_NAME securetransportbackend
CLASS_NAME QSecureTransportBackend CLASS_NAME QSecureTransportBackend
TYPE tls TYPE tls