Skip to content

Commit 3982de7

Browse files
tnodirisolovev
authored andcommitted
qlocale_win.cpp: Fix unity-build
Error after commit f039077: .../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 51e8d35 Change-Id: Ia32faa86bee6a284a5ad50ed82dcf8f08ab28dfd Reviewed-by: Ivan Solovev <[email protected]>
1 parent 9a06c8a commit 3982de7

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/corelib/text/qlocale_win.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -741,8 +741,7 @@ QVariant QSystemLocalePrivate::uiLanguages()
741741
{
742742
QStringList result;
743743
#if QT_CONFIG(cpp_winrt)
744-
using namespace winrt;
745-
using namespace Windows::System::UserProfile;
744+
using namespace winrt::Windows::System::UserProfile;
746745
QT_TRY {
747746
auto languages = GlobalizationPreferences::Languages();
748747
for (const auto &lang : languages)

0 commit comments

Comments
 (0)