whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Mårten Nordheim 2021-06-03 15:51:07 +02:00
parent f6f6d06028
commit d245e3a788
17 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/CMakeLists.txt
View File

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

2
src/network/kernel/qnetworkinformation.cpp
View File

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

2
src/plugins/CMakeLists.txt
View File

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

0
src/plugins/networkinformationbackends/CMakeLists.txt → src/plugins/networkinformation/CMakeLists.txt
View File

10
src/plugins/networkinformationbackends/android/CMakeLists.txt → src/plugins/networkinformation/android/CMakeLists.txt
View File

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

0
src/plugins/networkinformationbackends/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java → src/plugins/networkinformation/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java
View File

0
src/plugins/networkinformationbackends/android/qandroidnetworkinformationbackend.cpp → src/plugins/networkinformation/android/qandroidnetworkinformationbackend.cpp
View File

0
src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.cpp → src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.cpp
View File

0
src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.h → src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.h
View File

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

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

0
src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp → src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
View File

6
src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt → src/plugins/networkinformation/networkmanager/CMakeLists.txt
View File

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

0
src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp → src/plugins/networkinformation/networkmanager/qnetworkmanagernetworkinformationbackend.cpp
View File

0
src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.cpp → src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp
View File

0
src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.h → src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
View File

6
src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt → src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt
View File

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

0
src/plugins/networkinformationbackends/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm → src/plugins/networkinformation/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm
View File