1 files changed, 18 insertions, 65 deletions

diff --git a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
index 3e6e4074bb..766648486e 100644
--- a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
+++ b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtNetwork module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include <QtNetwork/private/qnetworkinformation_p.h>
 
@@ -45,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
@@ -104,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
                                              );
     }
@@ -118,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
@@ -157,24 +125,22 @@ 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);
 
     connect(managerEvents.Get(), &QNetworkListManagerEvents::transportMediumChanged, this,
             &QNetworkListManagerNetworkInformationBackend::setTransportMedium);
+
+    connect(managerEvents.Get(), &QNetworkListManagerEvents::isMeteredChanged, this,
+            &QNetworkListManagerNetworkInformationBackend::setMetered);
 }
 
 QNetworkListManagerNetworkInformationBackend::~QNetworkListManagerNetworkInformationBackend()
 {
-    if (comInitFailed)
-        return;
     stop();
 }
 
@@ -197,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);
 }
@@ -210,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();
 
@@ -231,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