Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/plugins/platforms/xcb/qxcbdrag.cpp

Change-Id: I0b47324b70b0b4894e54b21aa3e7a5041f9bd5e3

1 files changed, 122 insertions, 0 deletions

diff --git a/tests/benchmarks/corelib/time/qtimezone/main.cpp b/tests/benchmarks/corelib/time/qtimezone/main.cpp
index 65455a7261..133e6451bc 100644
--- a/tests/benchmarks/corelib/time/qtimezone/main.cpp
+++ b/tests/benchmarks/corelib/time/qtimezone/main.cpp
@@ -1,5 +1,6 @@
 /****************************************************************************
 **
+** Copyright (C) 2019 Crimson AS <info@crimson.no>
 ** Copyright (C) 2018 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com>
 ** Contact: https://www.qt.io/licensing/
 **
@@ -30,14 +31,57 @@
 #include <QTest>
 #include <qdebug.h>
 
+// Enable to test *every* zone, rather than a hand-picked few, in some _data() sets:
+// #define EXHAUSTIVE
+
 class tst_QTimeZone : public QObject
 {
     Q_OBJECT
 
 private Q_SLOTS:
     void isTimeZoneIdAvailable();
+    void systemTimeZone();
+    void zoneByName_data();
+    void zoneByName();
+    void transitionList_data();
+    void transitionList();
+    void transitionsForward_data() { transitionList_data(); }
+    void transitionsForward();
+    void transitionsReverse_data() { transitionList_data(); }
+    void transitionsReverse();
 };
 
+static QVector<QByteArray> enoughZones()
+{
+#ifdef EXHAUSTIVE
+    auto available = QTimeZone::availableTimeZoneIds();
+    QVector<QByteArray> result;
+    result.reserve(available.size() + 1);
+    for (conat auto &name : available)
+        result << name;
+#else
+    QVector<QByteArray> result{
+        QByteArray("UTC"),
+        // Those named overtly in tst_QDateTime:
+        QByteArray("Europe/Oslo"),
+        QByteArray("America/Vancouver"),
+        QByteArray("Europe/Berlin"),
+        QByteArray("America/Sao_Paulo"),
+        QByteArray("Pacific/Auckland"),
+        QByteArray("Australia/Eucla"),
+        QByteArray("Asia/Kathmandu"),
+        QByteArray("Pacific/Kiritimati"),
+        QByteArray("Pacific/Apia"),
+        QByteArray("UTC+12:00"),
+        QByteArray("Australia/Sydney"),
+        QByteArray("Asia/Singapore"),
+        QByteArray("Australia/Brisbane")
+    };
+#endif
+    result << QByteArray("Vulcan/ShiKahr"); // invalid: also worth testing
+    return result;
+}
+
 void tst_QTimeZone::isTimeZoneIdAvailable()
 {
     const QList<QByteArray> available = QTimeZone::availableTimeZoneIds();
@@ -47,6 +91,84 @@ void tst_QTimeZone::isTimeZoneIdAvailable()
     }
 }
 
+void tst_QTimeZone::systemTimeZone()
+{
+    QBENCHMARK {
+        QTimeZone::systemTimeZone();
+    }
+}
+
+void tst_QTimeZone::zoneByName_data()
+{
+    QTest::addColumn<QByteArray>("name");
+
+    const auto names = enoughZones();
+    for (const auto &name : names)
+        QTest::newRow(name.constData()) << name;
+}
+
+void tst_QTimeZone::zoneByName()
+{
+    QFETCH(QByteArray, name);
+    QTimeZone zone;
+    QBENCHMARK {
+        zone = QTimeZone(name);
+    }
+    Q_UNUSED(zone);
+}
+
+void tst_QTimeZone::transitionList_data()
+{
+    QTest::addColumn<QByteArray>("name");
+    QTest::newRow("system") << QByteArray(); // Handled specially in the test.
+
+    const auto names = enoughZones();
+    for (const auto &name : names) {
+        QTimeZone zone(name);
+        if (zone.isValid() && zone.hasTransitions())
+            QTest::newRow(name.constData()) << name;
+    }
+}
+
+void tst_QTimeZone::transitionList()
+{
+    QFETCH(QByteArray, name);
+    const QTimeZone zone = name.isEmpty() ? QTimeZone::systemTimeZone() : QTimeZone(name);
+    const QDateTime early = QDate(1625, 6, 8).startOfDay(Qt::UTC); // Cassini's birth date
+    const QDateTime late // End of 32-bit signed time_t
+        = QDateTime::fromSecsSinceEpoch(std::numeric_limits<qint32>::max(), Qt::UTC);
+    QTimeZone::OffsetDataList seq;
+    QBENCHMARK {
+        seq = zone.transitions(early, late);
+    }
+    Q_UNUSED(seq);
+}
+
+void tst_QTimeZone::transitionsForward()
+{
+    QFETCH(QByteArray, name);
+    const QTimeZone zone = name.isEmpty() ? QTimeZone::systemTimeZone() : QTimeZone(name);
+    const QDateTime early = QDate(1625, 6, 8).startOfDay(Qt::UTC); // Cassini's birth date
+    QBENCHMARK {
+        QTimeZone::OffsetData tran = zone.nextTransition(early);
+        while (tran.atUtc.isValid())
+            tran = zone.nextTransition(tran.atUtc);
+    }
+}
+
+void tst_QTimeZone::transitionsReverse()
+{
+    QFETCH(QByteArray, name);
+    const QTimeZone zone = name.isEmpty() ? QTimeZone::systemTimeZone() : QTimeZone(name);
+    const QDateTime late // End of 32-bit signed time_t
+        = QDateTime::fromSecsSinceEpoch(std::numeric_limits<qint32>::max(), Qt::UTC);
+    QBENCHMARK {
+        QTimeZone::OffsetData tran = zone.previousTransition(late);
+        while (tran.atUtc.isValid())
+            tran = zone.previousTransition(tran.atUtc);
+    }
+}
+
 QTEST_MAIN(tst_QTimeZone)
 
 #include "main.moc"