3rdparty/ext_qt/0001-Fix-QLocale-system-and-uiLanguages-for-the-mobile-pl.patch

0001 From 9088357832bc0ccc7debec37e5d783dd4ff6a9dd Mon Sep 17 00:00:00 2001
0002 From: Andy Shaw <andy.shaw@qt.io>
0003 Date: Thu, 23 Apr 2020 18:47:17 +0300
0004 Subject: [PATCH 01/46] Fix QLocale::system() and uiLanguages() for the mobile
0005  platforms
0006
0007 On iOS, it was no longer using the Cocoa specific code needed to get
0008 the locale and uiLanguages information so this functionality is brought
0009 back as it was accidently lost.
0010
0011 In addition, this has a side-effect of fixing a problem with Android
0012 versions below API 24 where it has no UiLanguages functionality so it
0013 gets the information based on the system locale as a fallback.
0014
0015 Fixes: QTBUG-81307
0016 Fixes: QTBUG-81357
0017 Change-Id: I1709675b5bd5e9cedefb99eaec28279f20a347a4
0018 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
0019 ---
0020  src/corelib/tools/qlocale.cpp | 2 ++
0021  1 file changed, 2 insertions(+)
0022
0023 diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
0024 index 9b8ab78716..f865791971 100644
0025 --- a/src/corelib/tools/qlocale.cpp
0026 +++ b/src/corelib/tools/qlocale.cpp
0027 @@ -4010,6 +4010,8 @@ QStringList QLocale::uiLanguages() const
0028              for (const auto entry : qAsConst(uiLanguages))
0029                  locales.append(QLocale(entry));
0030          }
0031 +        if (locales.isEmpty())
0032 +            locales.append(systemLocale()->fallbackUiLocale());
0033      } else
0034  #endif
0035      {
0036 --
0037 2.33.0
0038