1 files changed, 13 insertions, 27 deletions

diff --git a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
index eb42abc48e..766648486e 100644
--- a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
+++ b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
@@ -9,6 +9,8 @@
 #include <QtCore/private/qobject_p.h>
 #include <QtCore/qscopeguard.h>
 
+#include <QtCore/private/qfunctions_win_p.h>
+
 QT_BEGIN_NAMESPACE
 
 // Declared in qnetworklistmanagerevents.h
@@ -68,8 +70,9 @@ public:
     {
         return QNetworkInformation::Features(QNetworkInformation::Feature::Reachability
                                              | QNetworkInformation::Feature::CaptivePortal
-#ifdef SUPPORTS_WINRT
+#if QT_CONFIG(cpp_winrt)
                                              | QNetworkInformation::Feature::TransportMedium
+                                             | QNetworkInformation::Feature::Metered
 #endif
                                              );
     }
@@ -82,12 +85,13 @@ private:
     void setConnectivity(NLM_CONNECTIVITY newConnectivity);
     void checkCaptivePortal();
 
+    QComHelper comHelper;
+
     ComPtr<QNetworkListManagerEvents> managerEvents;
 
     NLM_CONNECTIVITY connectivity = NLM_CONNECTIVITY_DISCONNECTED;
 
     bool monitoring = false;
-    bool comInitFailed = false;
 };
 
 class QNetworkListManagerNetworkInformationBackendFactory : public QNetworkInformationBackendFactory
@@ -121,12 +125,9 @@ public:
 
 QNetworkListManagerNetworkInformationBackend::QNetworkListManagerNetworkInformationBackend()
 {
-    auto hr = CoInitialize(nullptr);
-    if (FAILED(hr)) {
-        qCWarning(lcNetInfoNLM) << "Failed to initialize COM:" << errorStringFromHResult(hr);
-        comInitFailed = true;
+    if (!comHelper.isValid())
         return;
-    }
+
     managerEvents = new QNetworkListManagerEvents();
     connect(managerEvents.Get(), &QNetworkListManagerEvents::connectivityChanged, this,
             &QNetworkListManagerNetworkInformationBackend::setConnectivity);
@@ -140,8 +141,6 @@ QNetworkListManagerNetworkInformationBackend::QNetworkListManagerNetworkInformat
 
 QNetworkListManagerNetworkInformationBackend::~QNetworkListManagerNetworkInformationBackend()
 {
-    if (comInitFailed)
-        return;
     stop();
 }
 
@@ -164,11 +163,8 @@ void QNetworkListManagerNetworkInformationBackend::checkCaptivePortal()
 
 bool QNetworkListManagerNetworkInformationBackend::event(QEvent *event)
 {
-    if (event->type() == QEvent::ThreadChange && monitoring) {
-        stop();
-        QMetaObject::invokeMethod(this, &QNetworkListManagerNetworkInformationBackend::start,
-                                  Qt::QueuedConnection);
-    }
+    if (event->type() == QEvent::ThreadChange)
+        qFatal("Moving QNetworkListManagerNetworkInformationBackend to different thread is not supported");
 
     return QObject::event(event);
 }
@@ -177,15 +173,9 @@ bool QNetworkListManagerNetworkInformationBackend::start()
 {
     Q_ASSERT(!monitoring);
 
-    if (comInitFailed) {
-        auto hr = CoInitialize(nullptr);
-        if (FAILED(hr)) {
-            qCWarning(lcNetInfoNLM) << "Failed to initialize COM:" << errorStringFromHResult(hr);
-            comInitFailed = true;
-            return false;
-        }
-        comInitFailed = false;
-    }
+    if (!comHelper.isValid())
+        return false;
+
     if (!managerEvents)
         managerEvents = new QNetworkListManagerEvents();
 
@@ -198,14 +188,10 @@ void QNetworkListManagerNetworkInformationBackend::stop()
 {
     if (monitoring) {
         Q_ASSERT(managerEvents);
-        // Can return false but realistically shouldn't since that would break everything:
         managerEvents->stop();
         monitoring = false;
         managerEvents.Reset();
     }
-
-    CoUninitialize();
-    comInitFailed = true; // we check this value in start() to see if we need to re-initialize
 }
 
 QT_END_NAMESPACE