diff options
| author | Nodir Temirkhodjaev <nodir.temir@gmail.com> | 2025-04-25 14:49:59 +0500 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2025-04-26 01:55:07 +0000 |
| commit | 3982de725a1240ff8de652513d1c2b58e39d624a (patch) | |
| tree | 3a8578ab167006aae945b982cda1f4e1ad623b53 | |
| parent | 9a06c8ae8c0c13d9a84ee18768e1c68169c31043 (diff) | |
qlocale_win.cpp: Fix unity-build
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>
| -rw-r--r-- | src/corelib/text/qlocale_win.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/text/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp index af1a53101e1..df99e468c79 100644 --- a/src/corelib/text/qlocale_win.cpp +++ b/src/corelib/text/qlocale_win.cpp @@ -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) |
