whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

De-pessimize Windows version of QSystemLocalePrivate::measurementSystem() 

Don't create a QString from a wchar_t array to check that the array
contains "1\0". Just do character-by-character comparison.

Change-Id: I7e5c2348c24af6a9b046c91423a52f756ceb9eb9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Marc Mutz 2022-03-14 16:47:29 +01:00 committed by Thiago Macieira
parent 9da4c6bfb7
commit 0d064328b2
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,10 +542,8 @@ QVariant QSystemLocalePrivate::measurementSystem()
wchar_t output[2];
if (getLocaleInfo(LOCALE_IMEASURE, output, 2)) {
QString iMeasure = QString::fromWCharArray(output);
if (iMeasure == QLatin1String("1")) {
if (output[0] == L'1' && !output[1])
return QLocale::ImperialSystem;
}
}
return QLocale::MetricSystem;