summaryrefslogtreecommitdiffstats
path: root/src/corelib/text/qlocale_win.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-03-14 16:47:29 +0100
committerThiago Macieira <thiago.macieira@intel.com>2022-03-15 10:36:09 +0000
commit0d064328b2500928287dff502328a29d84444baa (patch)
treeaf62b2195a1ad9388267d915d6a0b0dcf8acb7b9 /src/corelib/text/qlocale_win.cpp
parent9da4c6bfb70b5ea444b74ef05f1122d5983734e1 (diff)
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>
Diffstat (limited to 'src/corelib/text/qlocale_win.cpp')
-rw-r--r--src/corelib/text/qlocale_win.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/text/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp
index e5f5781208..695b363e5f 100644
--- a/src/corelib/text/qlocale_win.cpp
+++ b/src/corelib/text/qlocale_win.cpp
@@ -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;