diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-02-08 17:13:54 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2021-02-12 07:55:09 +0000 |
| commit | 2983fe8f0900778a668bc4fdaf00d38ed299b6d8 (patch) | |
| tree | 50e37723e3a5db0efa8d2e3fc957283b7f33adb3 /src/plugins | |
| parent | 2c55e121c22601d365aa353cfa39ee856770855c (diff) | |
QNetworkInformation fixups
Addressing feedback that came after the reviews
ended from both bot and people.
Added CLASS_NAME to the CMakeLists files for the plugins so that
cmake can generate the correct import.
Fixes: QTBUG-91061
Change-Id: Ib3f1e863100c1c421a6c0a4081b1d40696d67b23
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 92b15beb9aa09467583230a018c23114bb666a8e)
Diffstat (limited to 'src/plugins')
5 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/networkinformationbackends/android/CMakeLists.txt b/src/plugins/networkinformationbackends/android/CMakeLists.txt index d5d3fa5eb6..724dfd6788 100644 --- a/src/plugins/networkinformationbackends/android/CMakeLists.txt +++ b/src/plugins/networkinformationbackends/android/CMakeLists.txt @@ -16,6 +16,7 @@ install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend qt_internal_add_plugin(QAndroidNetworkInformationBackend OUTPUT_NAME androidnetworkinformationbackend + CLASS_NAME QAndroidNetworkInformationBackendFactory TYPE networkinformationbackends DEFAULT_IF ANDROID SOURCES diff --git a/src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt b/src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt index e3dcbfee97..363f22e18b 100644 --- a/src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt +++ b/src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt @@ -1,5 +1,6 @@ qt_internal_add_plugin(QNetworkListManagerNetworkInformationBackend OUTPUT_NAME networklistmanagernetworkinformationbackend + CLASS_NAME QNetworkListManagerNetworkInformationBackendFactory TYPE networkinformationbackends DEFAULT_IF WINDOWS AND QT_FEATURE_networklistmanager SOURCES qnetworklistmanagernetworkinformationbackend.cpp diff --git a/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt b/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt index 44a6e0f38d..c5fa1db526 100644 --- a/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt +++ b/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt @@ -1,5 +1,6 @@ qt_internal_add_plugin(QNetworkManagerNetworkInformationBackend OUTPUT_NAME networkmanagernetworkinformationbackend + CLASS_NAME QNetworkManagerNetworkInformationBackendFactory TYPE networkinformationbackends DEFAULT_IF LINUX SOURCES diff --git a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp b/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp index 1677f36fe1..1356078ee0 100644 --- a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp +++ b/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp @@ -97,6 +97,8 @@ public: bool isValid() const { return iface.isValid(); } private: + Q_DISABLE_COPY_MOVE(QNetworkManagerNetworkInformationBackend) + QNetworkManagerInterface iface; QNetworkManagerInterface::NMState prevState; }; @@ -128,6 +130,8 @@ public: delete std::exchange(backend, nullptr); return backend; } +private: + Q_DISABLE_COPY_MOVE(QNetworkManagerNetworkInformationBackendFactory) }; QNetworkManagerNetworkInformationBackend::QNetworkManagerNetworkInformationBackend() diff --git a/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt b/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt index d4a1c52c3f..e0b61fe141 100644 --- a/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt +++ b/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt @@ -1,5 +1,6 @@ qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationBackend OUTPUT_NAME scnetworkreachabilitynetworkinformationbackend + CLASS_NAME QSCNetworkReachabilityNetworkInformationBackendFactory TYPE networkinformationbackends DEFAULT_IF APPLE SOURCES |