QNetworkInformation: Rename the plugins and type

To better match other plugins in Qt

Pick-to: 6.2
Change-Id: I6ab19603f13c80a8afe4fe69f64669559a0eea15
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Yuhang Zhao <2546789017@qq.com>

src/network/CMakeLists.txt

@@ -5,7 +5,7 @@
 #####################################################################
 
 qt_internal_add_module(Network
-    PLUGIN_TYPES networkaccessbackends networkinformationbackends tls
+    PLUGIN_TYPES networkaccessbackends networkinformation tls
     SOURCES
         access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h
         access/qhsts.cpp access/qhsts_p.h

src/network/kernel/qnetworkinformation.cpp

@@ -64,7 +64,7 @@ struct QNetworkInformationDeleter
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
                           (QNetworkInformationBackendFactory_iid,
-                           QStringLiteral("/networkinformationbackends")))
+                           QStringLiteral("/networkinformation")))
 
 struct QStaticNetworkInformationDataHolder
 {

src/plugins/CMakeLists.txt

@@ -21,6 +21,6 @@ if(TARGET Qt::PrintSupport)
     add_subdirectory(printsupport)
 endif()
 if (TARGET Qt::Network)
-    add_subdirectory(networkinformationbackends)
+    add_subdirectory(networkinformation)
     add_subdirectory(tls)
 endif()

src/plugins/networkinformation/android/CMakeLists.txt

@@ -14,10 +14,10 @@ install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend
     COMPONENT Devel
 )
 
-qt_internal_add_plugin(QAndroidNetworkInformationBackendPlugin
-    OUTPUT_NAME androidnetworkinformationbackend
+qt_internal_add_plugin(QAndroidNetworkInformationPlugin
+    OUTPUT_NAME androidnetworkinformation
     CLASS_NAME QAndroidNetworkInformationBackendFactory
-    TYPE networkinformationbackends
+    TYPE networkinformation
     DEFAULT_IF ANDROID
     SOURCES
         qandroidnetworkinformationbackend.cpp
@@ -30,14 +30,14 @@ qt_internal_add_plugin(QAndroidNetworkInformationBackendPlugin
 
 set_property(
     TARGET
-        QAndroidNetworkInformationBackendPlugin
+        QAndroidNetworkInformationPlugin
     APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
         jar/Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend.jar
 )
 
 set_property(
     TARGET
-        QAndroidNetworkInformationBackendPlugin
+        QAndroidNetworkInformationPlugin
     APPEND PROPERTY QT_ANDROID_PERMISSIONS
         android.permission.ACCESS_NETWORK_STATE
 )

src/plugins/networkinformation/networklistmanager/CMakeLists.txt

@@ -1,7 +1,7 @@
 qt_internal_add_plugin(QNLMNIPlugin
     OUTPUT_NAME networklistmanager
     CLASS_NAME QNetworkListManagerNetworkInformationBackendFactory
-    TYPE networkinformationbackends
+    TYPE networkinformation
     DEFAULT_IF WINDOWS AND QT_FEATURE_networklistmanager
     SOURCES qnetworklistmanagernetworkinformationbackend.cpp
     PUBLIC_LIBRARIES

src/plugins/networkinformation/networkmanager/CMakeLists.txt

@@ -1,7 +1,7 @@
-qt_internal_add_plugin(QNetworkManagerNetworkInformationBackendPlugin
-    OUTPUT_NAME networkmanagernetworkinformationbackend
+qt_internal_add_plugin(QNetworkManagerNetworkInformationPlugin
+    OUTPUT_NAME networkmanager
     CLASS_NAME QNetworkManagerNetworkInformationBackendFactory
-    TYPE networkinformationbackends
+    TYPE networkinformation
     DEFAULT_IF LINUX
     SOURCES
         qnetworkmanagernetworkinformationbackend.cpp

src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt

@@ -1,7 +1,7 @@
-qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationBackendPlugin
-    OUTPUT_NAME scnetworkreachabilitynetworkinformationbackend
+qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationPlugin
+    OUTPUT_NAME scnetworkreachability
     CLASS_NAME QSCNetworkReachabilityNetworkInformationBackendFactory
-    TYPE networkinformationbackends
+    TYPE networkinformation
     DEFAULT_IF APPLE
     SOURCES
         qscnetworkreachabilitynetworkinformationbackend.mm