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/networkinformationbackends | |
| 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/networkinformationbackends')
4 files changed, 6 insertions, 6 deletions
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 |