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

QSystemLocale[Win]: Catch potential WinRT exceptions

Browse Source 
Some Windows SDKs seem to throw an exception from winrt::check_hresult()
We need to handle this accordingly.

Fixes: QTBUG-108605
Change-Id: I14ad3b6dbd9b5fdf0120f9d3336a4d922167d169
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 7d7ed24f517aff2f4bf9f2e32a29603476af6c88)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Vladimir Belyavsky 2022-11-18 16:56:03 +03:00 committed by Qt Cherry-pick Bot
parent d9c1ab0bf5
commit 192330439a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -663,9 +663,13 @@ QVariant QSystemLocalePrivate::uiLanguages()
#if QT_CONFIG(cpp_winrt) && !defined(Q_CC_CLANG) #if QT_CONFIG(cpp_winrt) && !defined(Q_CC_CLANG)
using namespace winrt; using namespace winrt;
using namespace Windows::System::UserProfile; using namespace Windows::System::UserProfile;
auto languages = GlobalizationPreferences::Languages(); QT_TRY {
for (const auto &lang : languages) auto languages = GlobalizationPreferences::Languages();
result << QString::fromStdString(winrt::to_string(lang)); for (const auto &lang : languages)
result << QString::fromStdString(winrt::to_string(lang));
} QT_CATCH(...) {
// pass, just fall back to WIN32 API implementation
}
if (!result.isEmpty()) if (!result.isEmpty())
return result; // else just fall back to WIN32 API implementation return result; // else just fall back to WIN32 API implementation
#endif // QT_CONFIG(cpp_winrt) && !defined(Q_CC_CLANG) #endif // QT_CONFIG(cpp_winrt) && !defined(Q_CC_CLANG)