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

Change-Id: Idf2bef470663864069bbf7e41af07b534936863a

2 files changed, 21 insertions, 16 deletions

diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index 919f9cb718..f8432b8472 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -2658,8 +2658,8 @@ void tst_QDateTime::zoneAtTime_data()
     ADDROW("before:NPT", "Asia/Kathmandu", QDate(1985, 12, 31), 19800); // 5:30
     ADDROW("after:NPT", "Asia/Kathmandu", QDate(1986, 1, 1), 20700); // 5:45
     // The two that have skipped a day (each):
-    ADDROW("before:LINT", "Pacific/Kiritimati", QDate(1994, 12, 31), -36000);
-    ADDROW("after:LINT", "Pacific/Kiritimati", QDate(1995, 2, 1), 14 * 3600);
+    ADDROW("before:LINT", "Pacific/Kiritimati", QDate(1994, 12, 30), -36000);
+    ADDROW("after:LINT", "Pacific/Kiritimati", QDate(1995, 1, 2), 14 * 3600);
     ADDROW("after:WST", "Pacific/Apia", QDate(2011, 12, 31), 14 * 3600);
 #endif // MS lacks ACWST, NPT; doesn't grok date-line crossings; and Windows 7 lacks LINT.
     ADDROW("before:WST", "Pacific/Apia", QDate(2011, 12, 29), -36000);
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index c6c16a5982..375cecd521 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -137,6 +137,7 @@ private slots:
     void formattedDataSize();
     void bcp47Name();
 
+    void systemLocale_data();
     void systemLocale();
 
     // *** ORDER-DEPENDENCY *** (This Is Bad.)
@@ -2682,27 +2683,31 @@ private:
     const QLocale m_locale;
 };
 
+void tst_QLocale::systemLocale_data()
+{
+    QTest::addColumn<QString>("name");
+    QTest::addColumn<QLocale::Language>("language");
+    QTest::addRow("catalan") << QString("ca") << QLocale::Catalan;
+    QTest::addRow("ukrainian") << QString("uk") << QLocale::Ukrainian;
+    QTest::addRow("german") << QString("de") << QLocale::German;
+}
+
 void tst_QLocale::systemLocale()
 {
     QLocale originalLocale;
+    QLocale originalSystemLocale = QLocale::system();
 
-    MySystemLocale *sLocale = new MySystemLocale(QLocale("uk"));
-    QCOMPARE(QLocale().language(), QLocale::Ukrainian);
-    QCOMPARE(QLocale::system().language(), QLocale::Ukrainian);
-    delete sLocale;
-
-    sLocale = new MySystemLocale(QLocale("ca"));
-    QCOMPARE(QLocale().language(), QLocale::Catalan);
-    QCOMPARE(QLocale::system().language(), QLocale::Catalan);
-    delete sLocale;
+    QFETCH(QString, name);
+    QFETCH(QLocale::Language, language);
 
-    sLocale = new MySystemLocale(QLocale("de"));
-    QCOMPARE(QLocale().language(), QLocale::German);
-    QCOMPARE(QLocale::system().language(), QLocale::German);
-    delete sLocale;
+    {
+        MySystemLocale sLocale(name);
+        QCOMPARE(QLocale().language(), language);
+        QCOMPARE(QLocale::system().language(), language);
+    }
 
     QCOMPARE(QLocale(), originalLocale);
-    QCOMPARE(QLocale::system(), originalLocale);
+    QCOMPARE(QLocale::system(), originalSystemLocale);
 }
 
 QTEST_MAIN(tst_QLocale)