1 files changed, 12 insertions, 15 deletions
diff --git a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.h b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.h
index cf9a08ca84..d91cd8a4cc 100644
--- a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.h
+++ b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.h
@@ -1,6 +1,9 @@
 // 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
 
+#ifndef QNETWORKLISTMANAGEREVENTS_H
+#define QNETWORKLISTMANAGEREVENTS_H
+
 #include <QtNetwork/private/qtnetworkglobal_p.h>
 
 #include <QtNetwork/qnetworkinformation.h>
@@ -8,19 +11,16 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qloggingcategory.h>
+#include <QtCore/qmutex.h>
 
 #include <objbase.h>
+#include <ocidl.h>
 #include <netlistmgr.h>
 #include <wrl/client.h>
 #include <wrl/wrappers/corewrappers.h>
-#include <comdef.h>
-
-#if QT_CONFIG(cpp_winrt) && !defined(Q_CC_CLANG)
-#define SUPPORTS_WINRT 1
-#endif
 
-#ifdef SUPPORTS_WINRT
-#include <winrt/base.h>
+#if QT_CONFIG(cpp_winrt)
+#include <QtCore/private/qt_winrtbase_p.h>
 #endif
 
 using namespace Microsoft::WRL;
@@ -28,12 +28,6 @@ using namespace Microsoft::WRL;
 QT_BEGIN_NAMESPACE
 Q_DECLARE_LOGGING_CATEGORY(lcNetInfoNLM)
 
-inline QString errorStringFromHResult(HRESULT hr)
-{
-    _com_error error(hr);
-    return QString::fromWCharArray(error.ErrorMessage());
-}
-
 class QNetworkListManagerEvents : public QObject, public INetworkListManagerEvents
 {
     Q_OBJECT
@@ -56,7 +50,7 @@ public:
     HRESULT STDMETHODCALLTYPE ConnectivityChanged(NLM_CONNECTIVITY newConnectivity) override;
 
     [[nodiscard]] bool start();
-    bool stop();
+    void stop();
 
     [[nodiscard]] bool checkBehindCaptivePortal();
 
@@ -69,10 +63,11 @@ private:
     ComPtr<INetworkListManager> networkListManager = nullptr;
     ComPtr<IConnectionPoint> connectionPoint = nullptr;
 
-#ifdef SUPPORTS_WINRT
+#if QT_CONFIG(cpp_winrt)
     void emitWinRTUpdates();
 
     winrt::event_token token;
+    QMutex winrtLock;
 #endif
 
     QAtomicInteger<ULONG> ref = 0;
@@ -80,3 +75,5 @@ private:
 };
 
 QT_END_NAMESPACE
+
+#endif // QNETWORKLISTMANAGEREVENTS_H