diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2022-08-26 10:09:15 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-26 16:21:47 +0200 |
commit | 0988ad85216c117f815e8e9ef20e7b7dfe10f1a8 (patch) | |
tree | 0859c292c8383a2b16d54329625aee0d58d61526 /src/corelib/text/qlocale_win.cpp | |
parent | d7ea07c8c1c51e3966388ab794a90e882e978d89 (diff) |
Remove superfluous clang preprocessor check for cpp/winrt
The cpp/winrt configure test fails if clang is being used so there is no
need to explicitly check for the compiler.
Change-Id: Ifb2cb792cf3ea2d2ff09be6e47d741f09aec765f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/corelib/text/qlocale_win.cpp')
-rw-r--r-- | src/corelib/text/qlocale_win.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/text/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp index dc867be696..7ec5dcd213 100644 --- a/src/corelib/text/qlocale_win.cpp +++ b/src/corelib/text/qlocale_win.cpp @@ -19,7 +19,7 @@ # include <time.h> #endif -#if QT_CONFIG(cpp_winrt) && !defined(Q_CC_CLANG) +#if QT_CONFIG(cpp_winrt) # include <winrt/base.h> // Workaround for Windows SDK bug. // See https://github.com/microsoft/Windows.UI.Composition-Win32-Samples/issues/47 @@ -31,7 +31,7 @@ namespace winrt::impl # include <winrt/Windows.Foundation.h> # include <winrt/Windows.Foundation.Collections.h> # include <winrt/Windows.System.UserProfile.h> -#endif // QT_CONFIG(cpp_winrt) && !defined(Q_CC_CLANG) +#endif // QT_CONFIG(cpp_winrt) QT_BEGIN_NAMESPACE @@ -661,7 +661,7 @@ QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToS QVariant QSystemLocalePrivate::uiLanguages() { QStringList result; -#if QT_CONFIG(cpp_winrt) && !defined(Q_CC_CLANG) +#if QT_CONFIG(cpp_winrt) using namespace winrt; using namespace Windows::System::UserProfile; auto languages = GlobalizationPreferences::Languages(); @@ -669,7 +669,7 @@ QVariant QSystemLocalePrivate::uiLanguages() result << QString::fromStdString(winrt::to_string(lang)); if (!result.isEmpty()) return result; // else just fall back to WIN32 API implementation -#endif // QT_CONFIG(cpp_winrt) && !defined(Q_CC_CLANG) +#endif // QT_CONFIG(cpp_winrt) // mingw and clang still have to use Win32 API unsigned long cnt = 0; QVarLengthArray<wchar_t, 64> buf(64); |