2 files changed, 97 insertions, 0 deletions

diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
index d3afee96cd..96eb792cb2 100644
--- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
@@ -1041,7 +1041,10 @@ void tst_QDateTime::toString_enumformat()
     QString str2 = dt1.toString(Qt::ISODate);
     QCOMPARE(str2, QString("1995-05-20T12:34:56"));
 
+#if QT_DEPRECATED_SINCE(5, 15)
+    QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED
     QString str3 = dt1.toString(Qt::LocalDate);
+    QT_WARNING_POP
     QVERIFY(!str3.isEmpty());
     //check for date/time components in any order
     //year may be 2 or 4 digits
@@ -1050,6 +1053,7 @@ void tst_QDateTime::toString_enumformat()
     QVERIFY(str3.contains("12"));
     QVERIFY(str3.contains("34"));
     //seconds may be absent
+#endif // 5.15 deprecations
 }
 
 void tst_QDateTime::addDays()
@@ -1098,6 +1102,18 @@ void tst_QDateTime::addDays()
     QCOMPARE(dt2.timeSpec(), Qt::OffsetFromUTC);
     QCOMPARE(dt2.offsetFromUtc(), 60 * 60);
 
+#if QT_CONFIG(timezone)
+    const QTimeZone cet("Europe/Oslo");
+    if (cet.isValid()) {
+        dt1 = QDate(2022, 1, 10).startOfDay(cet);
+        dt2 = dt1.addDays(2); // QTBUG-99668: should not assert
+        QCOMPARE(dt2.date(), QDate(2022, 1, 12));
+        QCOMPARE(dt2.time(), QTime(0, 0));
+        QCOMPARE(dt2.timeSpec(), Qt::TimeZone);
+        QCOMPARE(dt2.timeZone(), cet);
+    }
+#endif
+
     // ### test invalid QDateTime()
 }
 
diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
index a59b58d57f..59b94179f4 100644
--- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
+++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
@@ -31,6 +31,8 @@
 #include <private/qtimezoneprivate_p.h>
 #include <qlocale.h>
 
+Q_DECLARE_METATYPE(QTimeZone::TimeType)
+
 #if defined(Q_OS_WIN) && !QT_CONFIG(icu)
 #  define USING_WIN_TZ
 #endif
@@ -63,6 +65,7 @@ private slots:
     void isValidId_data();
     void isValidId();
     void malformed();
+    void serialize();
     // Backend tests
     void utcTest();
     void icuTest();
@@ -70,6 +73,8 @@ private slots:
     void macTest();
     void darwinTypes();
     void winTest();
+    void localeSpecificDisplayName_data();
+    void localeSpecificDisplayName();
 
 private:
     void printTimeZone(const QTimeZone &tz);
@@ -947,6 +952,33 @@ void tst_QTimeZone::malformed()
         barf.offsetFromUtc(now);
 }
 
+void tst_QTimeZone::serialize()
+{
+    int parts = 0;
+#ifndef QT_NO_DEBUG_STREAM
+    qDebug() << QTimeZone(); // to verify no crash
+    parts++;
+#endif
+#ifndef QT_NO_DATASTREAM
+    QByteArray blob;
+    {
+        QDataStream stream(&blob, QIODevice::WriteOnly);
+        stream << QTimeZone("Europe/Oslo") << QTimeZone(420) << QTimeZone() << qint64(-1);
+    }
+    QDataStream stream(&blob, QIODevice::ReadOnly);
+    QTimeZone invalid, offset, oslo;
+    qint64 minusone;
+    stream >> oslo >> offset >> invalid >> minusone;
+    QCOMPARE(oslo, QTimeZone("Europe/Oslo"));
+    QCOMPARE(offset, QTimeZone(420));
+    QVERIFY(!invalid.isValid());
+    QCOMPARE(minusone, qint64(-1));
+    parts++;
+#endif
+    if (!parts)
+        QSKIP("No serialization enabled");
+}
+
 void tst_QTimeZone::utcTest()
 {
 #ifdef QT_BUILD_INTERNAL
@@ -1366,6 +1398,55 @@ void tst_QTimeZone::winTest()
 #endif // QT_BUILD_INTERNAL && USING_WIN_TZ
 }
 
+void tst_QTimeZone::localeSpecificDisplayName_data()
+{
+#ifdef USING_WIN_TZ
+    QSKIP("MS backend does not use locale parameter");
+#endif
+    QTest::addColumn<QByteArray>("zoneName");
+    QTest::addColumn<QLocale>("locale");
+    QTest::addColumn<QTimeZone::TimeType>("timeType");
+    QTest::addColumn<QString>("expectedName");
+
+    QStringList names;
+    QLocale locale;
+    // Pick a non-system locale; German or French
+    if (QLocale::system().language() != QLocale::German) {
+        locale = QLocale(QLocale::German);
+        names << QString("Mitteleurop\u00e4ische Normalzeit")
+              << QString("Mitteleurop\u00e4ische Sommerzeit");
+    } else {
+        locale = QLocale(QLocale::French);
+        names << QString("heure normale d\u2019Europe centrale")
+              << QString("heure d\u2019\u00E9t\u00E9 d\u2019Europe centrale");
+    }
+
+    qsizetype index = 0;
+    QTest::newRow("Berlin, standard time")
+            << QByteArray("Europe/Berlin") << locale << QTimeZone::StandardTime
+            << names.at(index++);
+
+    QTest::newRow("Berlin, summer time")
+            << QByteArray("Europe/Berlin") << locale << QTimeZone::DaylightTime
+            << names.at(index++);
+}
+
+void tst_QTimeZone::localeSpecificDisplayName()
+{
+    // This test checks that QTimeZone::displayName() correctly uses the
+    // specified locale, NOT the system locale (see QTBUG-101460).
+    QFETCH(QByteArray, zoneName);
+    QFETCH(QLocale, locale);
+    QFETCH(QTimeZone::TimeType, timeType);
+    QFETCH(QString, expectedName);
+
+    QTimeZone zone(zoneName);
+    QVERIFY(zone.isValid());
+
+    const QString localeName = zone.displayName(timeType, QTimeZone::LongName, locale);
+    QCOMPARE(localeName, expectedName);
+}
+
 #ifdef QT_BUILD_INTERNAL
 // Test each private produces the same basic results for CET
 void tst_QTimeZone::testCetPrivate(const QTimeZonePrivate &tzp)