From 6da057d811fd9494e1c173ba38d54bc3e9810f41 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Mon, 21 Nov 2022 18:55:40 +0100
Subject: [PATCH] networklistmanager: allow building with LLVM-MinGW

At https://github.com/mstorsjo/llvm-mingw/issues/307 we can see that
LLVM-MinGW is able to build qtbase with winrt headers and cxx20 feature.

Change-Id: Ib4b5df7481f684ebdb26cbc4246bdf86ff3dd648
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 src/network/configure.cmake                                     | 1 +
 .../networklistmanager/qnetworklistmanagerevents.cpp            | 2 +-
 .../networklistmanager/qnetworklistmanagerevents.h              | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/network/configure.cmake b/src/network/configure.cmake
index 9d3bd33501f..6afa139058f 100644
--- a/src/network/configure.cmake
+++ b/src/network/configure.cmake
@@ -166,6 +166,7 @@ qt_config_compile_test(networklistmanager
     LABEL "Network List Manager"
     CODE
 "#include <netlistmgr.h>
+#include <ocidl.h>
 #include <wrl/client.h>
 
 int main(void)
diff --git a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp
index 73691f09719..f46dfb88ee9 100644
--- a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp
+++ b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp
@@ -172,7 +172,7 @@ bool QNetworkListManagerEvents::checkBehindCaptivePortal()
             VariantInit(&variant);
             const auto scopedVariantClear = qScopeGuard([&variant]() { VariantClear(&variant); });
 
-            const wchar_t *versions[] = { NA_InternetConnectivityV6, NA_InternetConnectivityV4 };
+            const wchar_t *versions[] = { L"NA_InternetConnectivityV6", L"NA_InternetConnectivityV4" };
             for (const auto version : versions) {
                 hr = propertyBag->Read(version, &variant, nullptr);
                 if (SUCCEEDED(hr)
diff --git a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.h b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.h
index 6de3a6e3594..43a3252c497 100644
--- a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.h
+++ b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.h
@@ -11,6 +11,7 @@
 #include <QtCore/qmutex.h>
 
 #include <objbase.h>
+#include <ocidl.h>
 #include <netlistmgr.h>
 #include <wrl/client.h>
 #include <wrl/wrappers/corewrappers.h>