Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: Icd201bf6b634e44e0e2ab05eaf91a7d8588d7f05

1 files changed, 17 insertions, 18 deletions

diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index 9364122593..ff36beadcb 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -1802,24 +1802,23 @@ void tst_QLocale::macDefaultLocale()
 
     // Depending on the configured time zone, the time string might not
     // contain a GMT specifier. (Sometimes it just names the zone, like "CEST")
-    if (timeString.contains(QString("GMT"))) {
-        QString expectedGMTSpecifierBase("GMT");
-        if (diff >= 0)
-            expectedGMTSpecifierBase.append(QLatin1Char('+'));
-        else
-            expectedGMTSpecifierBase.append(QLatin1Char('-'));
-
-        QString expectedGMTSpecifier = expectedGMTSpecifierBase + QString("%1").arg(qAbs(diff));
-        QString expectedGMTSpecifierZeroExtended
-            = expectedGMTSpecifierBase + QString("0%1").arg(qAbs(diff));
-
-        QVERIFY2(timeString.contains(expectedGMTSpecifier)
-            || timeString.contains(expectedGMTSpecifierZeroExtended),
-            qPrintable(QString("timeString `%1', expectedGMTSpecifier `%2' or `%3'")
-            .arg(timeString)
-            .arg(expectedGMTSpecifier)
-            .arg(expectedGMTSpecifierZeroExtended)
-        ));
+    QLatin1String gmt("GMT");
+    if (timeString.contains(gmt) && diff) {
+        QLatin1Char sign(diff < 0 ? '-' : '+');
+        QString number(QString::number(qAbs(diff)));
+        const QString expect = gmt + sign + number;
+
+        if (diff < 10) {
+            const QString zeroed = gmt + sign + QLatin1Char('0') + number;
+
+            QVERIFY2(timeString.contains(expect) || timeString.contains(zeroed),
+                     qPrintable(QString("timeString `%1', expected GMT specifier `%2' or `%3'")
+                                .arg(timeString).arg(expect).arg(zeroed)));
+        } else {
+            QVERIFY2(timeString.contains(expect),
+                     qPrintable(QString("timeString `%1', expected GMT specifier `%2'")
+                                .arg(timeString).arg(expect)));
+        }
     }
     QCOMPARE(locale.dayName(1), QString("Monday"));
     QCOMPARE(locale.dayName(7), QString("Sunday"));