diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-04 16:18:44 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-06 21:08:21 +0200 |
| commit | b2f00dfb46af633b00946cb1ebfe963964f803ca (patch) | |
| tree | 0b52bda2d0e77744c7969c06ce5882c8d7c9cb2d /src/plugins/networkinformation | |
| parent | eb4fb9fa32797d48d4779464483230ad92f349a6 (diff) | |
| download | qtbase-b2f00dfb46af633b00946cb1ebfe963964f803ca.tar.gz | |
CMake: Rename qt6_add_plugin TYPE option to PLUGIN_TYPE
The intention is to remove TYPE as a keyword completely before 6.2.0
release, but in case if that's not possible due to the large amount
of repositories and examples, just print a deprecation warning for
now and handle both TYPE and PLUGIN_TYPE.
Task-number: QTBUG-95170
Pick-to: 6.2
Change-Id: If0c18345483b9254b0fc21120229fcc2a2fbfbf5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/networkinformation')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/networkinformation/android/CMakeLists.txt b/src/plugins/networkinformation/android/CMakeLists.txt index f1d260547a..de05bdfb1c 100644 --- a/src/plugins/networkinformation/android/CMakeLists.txt +++ b/src/plugins/networkinformation/android/CMakeLists.txt @@ -17,7 +17,7 @@ install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend qt_internal_add_plugin(QAndroidNetworkInformationPlugin OUTPUT_NAME androidnetworkinformation CLASS_NAME QAndroidNetworkInformationBackendFactory - TYPE networkinformation + PLUGIN_TYPE networkinformation DEFAULT_IF ANDROID SOURCES qandroidnetworkinformationbackend.cpp diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt index 1ffdfdec17..ab6fdf1d0a 100644 --- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt +++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt @@ -1,7 +1,7 @@ qt_internal_add_plugin(QNLMNIPlugin OUTPUT_NAME networklistmanager CLASS_NAME QNetworkListManagerNetworkInformationBackendFactory - TYPE networkinformation + PLUGIN_TYPE networkinformation DEFAULT_IF WIN32 AND QT_FEATURE_networklistmanager SOURCES qnetworklistmanagernetworkinformationbackend.cpp LIBRARIES diff --git a/src/plugins/networkinformation/networkmanager/CMakeLists.txt b/src/plugins/networkinformation/networkmanager/CMakeLists.txt index a80a7ac656..514b35fdd9 100644 --- a/src/plugins/networkinformation/networkmanager/CMakeLists.txt +++ b/src/plugins/networkinformation/networkmanager/CMakeLists.txt @@ -1,7 +1,7 @@ qt_internal_add_plugin(QNetworkManagerNetworkInformationPlugin OUTPUT_NAME networkmanager CLASS_NAME QNetworkManagerNetworkInformationBackendFactory - TYPE networkinformation + PLUGIN_TYPE networkinformation DEFAULT_IF LINUX SOURCES qnetworkmanagernetworkinformationbackend.cpp diff --git a/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt b/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt index 6a15bde1c0..f7875526f6 100644 --- a/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt +++ b/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt @@ -1,7 +1,7 @@ qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationPlugin OUTPUT_NAME scnetworkreachability CLASS_NAME QSCNetworkReachabilityNetworkInformationBackendFactory - TYPE networkinformation + PLUGIN_TYPE networkinformation DEFAULT_IF APPLE SOURCES qscnetworkreachabilitynetworkinformationbackend.mm |