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

qlocale_win.cpp: Fix unity-build

Browse Source 
Error after commit f039077830f41ca7ea7b1d91a4f7ad45a6613ea6:
.../qtbase/src/corelib/text/qlocale_win.cpp(745):
 error C2872: 'Windows': ambiguous symbol

C:\Program Files (x86)\Windows Kits\10\include\10.0.26100.0\winrt\wrl/
client.h(927): note: could be 'Windows'

C:\Program Files (x86)\Windows Kits\10\include\10.0.26100.0\cppwinrt\
winrt/Windows.System.UserProfile.h(890): note: or 'winrt::Windows'

Amends 51e8d3592acc8bacf326fe3933b5dec13bb518e6

Change-Id: Ia32faa86bee6a284a5ad50ed82dcf8f08ab28dfd
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
Nodir Temirkhodjaev 2025-04-25 14:49:59 +05:00 committed by Ivan Solovev
parent 9a06c8ae8c
commit 3982de725a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/text/qlocale_win.cpp
View File

@ -741,8 +741,7 @@ QVariant QSystemLocalePrivate::uiLanguages()
{
QStringList result;
#if QT_CONFIG(cpp_winrt)
using namespace winrt;
using namespace Windows::System::UserProfile;
using namespace winrt::Windows::System::UserProfile;
QT_TRY {
auto languages = GlobalizationPreferences::Languages();
for (const auto &lang : languages)