Adapt corelib to use QTimeZone in place of Qt::TimeSpec

This saves (mostly in corelib/time/) some complications that used to
arise from needing different code-paths for different time-specs.

Task-number: QTBUG-108199
Change-Id: I5dbd09859fce7599f1ba761f8a0bfc4633d0bef9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

2 files changed, 8 insertions, 8 deletions

diff --git a/tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp b/tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp
index ca648c051e..3ba5b5fb9f 100644
--- a/tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp
+++ b/tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp
@@ -390,7 +390,7 @@ void tst_QDateTime::equivalentUtc()
 {
     bool result = false;
     const QDateTime other = QDateTime::fromMSecsSinceEpoch(
-        qint64(JULIAN_DAY_2010 - JULIAN_DAY_1970) * MSECS_PER_DAY, Qt::UTC);
+        qint64(JULIAN_DAY_2010 - JULIAN_DAY_1970) * MSECS_PER_DAY, QTimeZone::UTC);
     const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2020);
     QBENCHMARK {
         for (const QDateTime &test : list)
@@ -416,7 +416,7 @@ void tst_QDateTime::lessThanUtc()
 {
     bool result = false;
     const QDateTime other = QDateTime::fromMSecsSinceEpoch(
-        qint64(JULIAN_DAY_2010 - JULIAN_DAY_1970) * MSECS_PER_DAY, Qt::UTC);
+        qint64(JULIAN_DAY_2010 - JULIAN_DAY_1970) * MSECS_PER_DAY, QTimeZone::UTC);
     const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2020);
     QBENCHMARK {
         for (const QDateTime &test : list)
@@ -500,7 +500,7 @@ void tst_QDateTime::fromMSecsSinceEpoch()
     const int end = JULIAN_DAY_2020 - JULIAN_DAY_1970;
     QBENCHMARK {
         for (int jd = start; jd < end; ++jd)
-            QDateTime::fromMSecsSinceEpoch(jd * MSECS_PER_DAY, Qt::LocalTime);
+            QDateTime::fromMSecsSinceEpoch(jd * MSECS_PER_DAY);
     }
 }
 
@@ -510,7 +510,7 @@ void tst_QDateTime::fromMSecsSinceEpochUtc()
     const int end = JULIAN_DAY_2020 - JULIAN_DAY_1970;
     QBENCHMARK {
         for (int jd = start; jd < end; ++jd)
-            QDateTime::fromMSecsSinceEpoch(jd * MSECS_PER_DAY, Qt::UTC);
+            QDateTime::fromMSecsSinceEpoch(jd * MSECS_PER_DAY, QTimeZone::UTC);
     }
 }
 
diff --git a/tests/benchmarks/corelib/time/qtimezone/tst_bench_qtimezone.cpp b/tests/benchmarks/corelib/time/qtimezone/tst_bench_qtimezone.cpp
index 8d34ca50a3..0cd4065824 100644
--- a/tests/benchmarks/corelib/time/qtimezone/tst_bench_qtimezone.cpp
+++ b/tests/benchmarks/corelib/time/qtimezone/tst_bench_qtimezone.cpp
@@ -108,9 +108,9 @@ 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 early = QDate(1625, 6, 8).startOfDay(QTimeZone::UTC); // Cassini's birth date
     const QDateTime late // End of 32-bit signed time_t
-        = QDateTime::fromSecsSinceEpoch(std::numeric_limits<qint32>::max(), Qt::UTC);
+        = QDateTime::fromSecsSinceEpoch(std::numeric_limits<qint32>::max(), QTimeZone::UTC);
     QTimeZone::OffsetDataList seq;
     QBENCHMARK {
         seq = zone.transitions(early, late);
@@ -122,7 +122,7 @@ 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
+    const QDateTime early = QDate(1625, 6, 8).startOfDay(QTimeZone::UTC); // Cassini's birth date
     QBENCHMARK {
         QTimeZone::OffsetData tran = zone.nextTransition(early);
         while (tran.atUtc.isValid())
@@ -135,7 +135,7 @@ 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);
+        = QDateTime::fromSecsSinceEpoch(std::numeric_limits<qint32>::max(), QTimeZone::UTC);
     QBENCHMARK {
         QTimeZone::OffsetData tran = zone.previousTransition(late);
         while (tran.atUtc.isValid())