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

Use the right UI language lookup in macOS backend for QSystemLocale

Browse Source 
Use CFLocaleCopyPreferredLanguages() instead of a home-grown call to a
low-level API. Brought to light by QTBUG-87858.

Change-Id: Ica22c446e01930da65d34c8851e3e67c9d020d8b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Edward Welbourne 2020-10-26 12:58:43 +01:00
parent 8693d473e5
commit a74f534864
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/corelib/text/qlocale_mac.mm
View File

@ -484,30 +484,15 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const
case CurrencyToString: case CurrencyToString:
return macFormatCurrency(in.value<QSystemLocale::CurrencyToStringArgument>()); return macFormatCurrency(in.value<QSystemLocale::CurrencyToStringArgument>());
case UILanguages: { case UILanguages: {
QCFType<CFPropertyListRef> languages = CFPreferencesCopyValue(
CFSTR("AppleLanguages"),
kCFPreferencesAnyApplication,
kCFPreferencesCurrentUser,
kCFPreferencesAnyHost);
QStringList result; QStringList result;
if (!languages) QCFType<CFArrayRef> languages = CFLocaleCopyPreferredLanguages();
return QVariant(result); const int cnt = CFArrayGetCount(languages);
CFTypeID typeId = CFGetTypeID(languages);
if (typeId == CFArrayGetTypeID()) {
const int cnt = CFArrayGetCount(languages.as<CFArrayRef>());
result.reserve(cnt); result.reserve(cnt);
for (int i = 0; i < cnt; ++i) { for (int i = 0; i < cnt; ++i) {
const QString lang = QString::fromCFString( const QString lang = QString::fromCFString(
static_cast<CFStringRef>(CFArrayGetValueAtIndex(languages.as<CFArrayRef>(), i))); static_cast<CFStringRef>(CFArrayGetValueAtIndex(languages, i)));
result.append(lang); result.append(lang);
} }
} else if (typeId == CFStringGetTypeID()) {
result = QStringList(QString::fromCFString(languages.as<CFStringRef>()));
} else {
qWarning("QLocale::uiLanguages(): CFPreferencesCopyValue returned unhandled type \"%ls\"; please report to http://bugreports.qt.io",
qUtf16Printable(QString::fromCFString(CFCopyTypeIDDescription(typeId))));
}
return QVariant(result); return QVariant(result);
} }
case StringToStandardQuotation: case StringToStandardQuotation: