Enable system locale to skip digit-grouping if configured to do so

On macOS it's possible to configure the system locale to not do digit
grouping (separating "thousands", in most western locales); it then
returns an empty string when asked for the grouping character, which
QLocale's system-configuration then ignored, falling back on using the
base UI locale's grouping separator. This could lead to the same
separator being used for decimal and grouping, which should never
happen, least of all when configured to not group at all.

In order to notice when this happens, query() must take care to return
an empty QString (as a QVariant, which is then non-null) when it *has*
a value for the locale property, and that value is empty, as opposed
to a null QVariant when it doesn't find a configured value. The caller
can then distinguish the two cases.

Furthermore, the group and decimal separators need to be distinct, so
we need to take care to avoid cases where the system overrides one
with what the CLDR has given for the other and doesn't over-ride that
other.

Only presently implemented for macOS and MS-Win, since the (other)
Unix implementation of the system locale returns single QChar values
for the numeric tokens - see QTBUG-69324, QTBUG-81053.

Fixes: QTBUG-80459
Change-Id: Ic3fbb0fb86e974604a60781378b09abc13bab15d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 17 insertions, 13 deletions

diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
index 8f434acb29..60ed22488f 100644
--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -1869,14 +1869,16 @@ void tst_QLocale::toDateTime()
 
 // Format number string according to system locale settings.
 // Expected in format is US "1,234.56".
-QString systemLocaleFormatNumber(const QString &numberString)
+QString systemLocaleFormatNumber(QString &&numberString)
 {
     QLocale locale = QLocale::system();
-    QString numberStringCopy = numberString;
-    return numberStringCopy.replace(QChar(','), QChar('G'))
-                           .replace(QChar('.'), QChar('D'))
-                           .replace(QChar('G'), locale.groupSeparator())
-                           .replace(QChar('D'), locale.decimalPoint());
+    QString numberStringMunged =
+        numberString.replace(QChar(','), QChar('G')).replace(QChar('.'), QChar('D'));
+    if (locale.numberOptions() & QLocale::OmitGroupSeparator)
+        numberStringMunged.remove(QLatin1Char('G'));
+    else
+        numberStringMunged.replace(QChar('G'), locale.groupSeparator());
+    return numberStringMunged.replace(QChar('D'), locale.decimalPoint());
 }
 
 void tst_QLocale::macDefaultLocale()
@@ -1899,12 +1901,14 @@ void tst_QLocale::macDefaultLocale()
     // independently of the locale. Verify that they have one of the
     // allowed values and are not the same.
     QVERIFY(locale.decimalPoint() == QChar('.') || locale.decimalPoint() == QChar(','));
-    QVERIFY(locale.groupSeparator() == QChar(',')
-        || locale.groupSeparator() == QChar('.')
-        || locale.groupSeparator() == QChar('\xA0') // no-breaking space
-        || locale.groupSeparator() == QChar('\'')
-        || locale.groupSeparator() == QChar());
-    QVERIFY(locale.decimalPoint() != locale.groupSeparator());
+    if (!(locale.numberOptions() & QLocale::OmitGroupSeparator)) {
+        QVERIFY(locale.groupSeparator() == QChar(',')
+             || locale.groupSeparator() == QChar('.')
+             || locale.groupSeparator() == QChar('\xA0') // no-breaking space
+             || locale.groupSeparator() == QChar('\'')
+             || locale.groupSeparator() == QChar());
+        QVERIFY(locale.decimalPoint() != locale.groupSeparator());
+    }
 
     // make sure we are using the system to parse them
     QCOMPARE(locale.toString(1234.56), systemLocaleFormatNumber(QString("1,234.56")));