1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

networklistmanager: allow building with LLVM-MinGW

Browse Source 
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>
This commit is contained in:
Cristian Adam 2022-11-21 18:55:40 +01:00
parent be4352cb84
commit 6da057d811
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/configure.cmake
View File

@ -166,6 +166,7 @@ qt_config_compile_test(networklistmanager
LABEL "Network List Manager" LABEL "Network List Manager"
CODE CODE
"#include <netlistmgr.h> "#include <netlistmgr.h>
#include <ocidl.h>
#include <wrl/client.h> #include <wrl/client.h>
int main(void) int main(void)

2
src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp
View File

@ -172,7 +172,7 @@ bool QNetworkListManagerEvents::checkBehindCaptivePortal()
VariantInit(&variant); VariantInit(&variant);
const auto scopedVariantClear = qScopeGuard([&variant]() { VariantClear(&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) { for (const auto version : versions) {
hr = propertyBag->Read(version, &variant, nullptr); hr = propertyBag->Read(version, &variant, nullptr);
if (SUCCEEDED(hr) if (SUCCEEDED(hr)

1
src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.h
View File

@ -11,6 +11,7 @@
#include <QtCore/qmutex.h> #include <QtCore/qmutex.h>
#include <objbase.h> #include <objbase.h>
#include <ocidl.h>
#include <netlistmgr.h> #include <netlistmgr.h>
#include <wrl/client.h> #include <wrl/client.h>
#include <wrl/wrappers/corewrappers.h> #include <wrl/wrappers/corewrappers.h>