summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2021-06-03 15:51:07 +0200
committerMårten Nordheim <marten.nordheim@qt.io>2021-06-11 19:23:03 +0200
commitd245e3a7883ccb2c8beabbca5094de54ec963644 (patch)
tree731cd57605802d03d3193540db147727ad38a077 /src/plugins
parentf6f6d06028a62fef3e0d8458903549499fced45a (diff)
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>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/CMakeLists.txt2
-rw-r--r--src/plugins/networkinformation/CMakeLists.txt (renamed from src/plugins/networkinformationbackends/CMakeLists.txt)0
-rw-r--r--src/plugins/networkinformation/android/CMakeLists.txt (renamed from src/plugins/networkinformationbackends/android/CMakeLists.txt)10
-rw-r--r--src/plugins/networkinformation/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java (renamed from src/plugins/networkinformationbackends/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java)0
-rw-r--r--src/plugins/networkinformation/android/qandroidnetworkinformationbackend.cpp (renamed from src/plugins/networkinformationbackends/android/qandroidnetworkinformationbackend.cpp)0
-rw-r--r--src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.cpp (renamed from src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.cpp)0
-rw-r--r--src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.h (renamed from src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.h)0
-rw-r--r--src/plugins/networkinformation/networklistmanager/CMakeLists.txt (renamed from src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt)2
-rw-r--r--src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp (renamed from src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp)0
-rw-r--r--src/plugins/networkinformation/networkmanager/CMakeLists.txt (renamed from src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt)6
-rw-r--r--src/plugins/networkinformation/networkmanager/qnetworkmanagernetworkinformationbackend.cpp (renamed from src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp)0
-rw-r--r--src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp (renamed from src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.cpp)0
-rw-r--r--src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h (renamed from src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.h)0
-rw-r--r--src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt (renamed from src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt)6
-rw-r--r--src/plugins/networkinformation/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm (renamed from src/plugins/networkinformationbackends/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm)0
15 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 92aeafb768..4c3b3a39b4 100644
--- a/src/plugins/CMakeLists.txt
+++ b/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()
diff --git a/src/plugins/networkinformationbackends/CMakeLists.txt b/src/plugins/networkinformation/CMakeLists.txt
index 142031c62a..142031c62a 100644
--- a/src/plugins/networkinformationbackends/CMakeLists.txt
+++ b/src/plugins/networkinformation/CMakeLists.txt
diff --git a/src/plugins/networkinformationbackends/android/CMakeLists.txt b/src/plugins/networkinformation/android/CMakeLists.txt
index 6c48b3ff49..f1d260547a 100644
--- a/src/plugins/networkinformationbackends/android/CMakeLists.txt
+++ b/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
)
diff --git a/src/plugins/networkinformationbackends/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java b/src/plugins/networkinformation/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java
index 0e89d23ab4..0e89d23ab4 100644
--- a/src/plugins/networkinformationbackends/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java
+++ b/src/plugins/networkinformation/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java
diff --git a/src/plugins/networkinformationbackends/android/qandroidnetworkinformationbackend.cpp b/src/plugins/networkinformation/android/qandroidnetworkinformationbackend.cpp
index 9eef471989..9eef471989 100644
--- a/src/plugins/networkinformationbackends/android/qandroidnetworkinformationbackend.cpp
+++ b/src/plugins/networkinformation/android/qandroidnetworkinformationbackend.cpp
diff --git a/src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.cpp b/src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.cpp
index e88fe7d955..e88fe7d955 100644
--- a/src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.cpp
+++ b/src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.cpp
diff --git a/src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.h b/src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.h
index 14f5aa9b57..14f5aa9b57 100644
--- a/src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.h
+++ b/src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.h
diff --git a/src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
index 862ee67fa2..52f19aefa9 100644
--- a/src/plugins/networkinformationbackends/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 networkinformationbackends
+ TYPE networkinformation
DEFAULT_IF WINDOWS AND QT_FEATURE_networklistmanager
SOURCES qnetworklistmanagernetworkinformationbackend.cpp
PUBLIC_LIBRARIES
diff --git a/src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
index d37f83832b..d37f83832b 100644
--- a/src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
+++ b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
diff --git a/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt b/src/plugins/networkinformation/networkmanager/CMakeLists.txt
index 2f5b5e9d4f..900364c32f 100644
--- a/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt
+++ b/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
diff --git a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp b/src/plugins/networkinformation/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
index bfb04ae4a6..bfb04ae4a6 100644
--- a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
+++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
diff --git a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp
index 764507fd4b..764507fd4b 100644
--- a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.cpp
+++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp
diff --git a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.h b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
index 57c5aed763..57c5aed763 100644
--- a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.h
+++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
diff --git a/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt b/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt
index 9f8b9846b5..87ca1f0a6d 100644
--- a/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt
+++ b/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
diff --git a/src/plugins/networkinformationbackends/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm b/src/plugins/networkinformation/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm
index c732afc012..c732afc012 100644
--- a/src/plugins/networkinformationbackends/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm
+++ b/src/plugins/networkinformation/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm