1 files changed, 44 insertions, 19 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..1c86eae009 100644
--- a/tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp
+++ b/tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp
@@ -1,18 +1,21 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QDateTime>
 #include <QTimeZone>
 #include <QTest>
 #include <QList>
 #include <qdebug.h>
+#include <QtCore/private/qdatetime_p.h>
 
 class tst_QDateTime : public QObject
 {
     Q_OBJECT
 
     static QList<QDateTime> daily(qint64 start, qint64 end);
+#if QT_CONFIG(timezone)
     static QList<QDateTime> norse(qint64 start, qint64 end);
+#endif
     void decade_data();
 
 private Q_SLOTS:
@@ -27,23 +30,33 @@ private Q_SLOTS:
     void timeZoneAbbreviation();
     void toMSecsSinceEpoch_data() { decade_data(); }
     void toMSecsSinceEpoch();
+#if QT_CONFIG(timezone) 
     void toMSecsSinceEpochTz_data() { decade_data(); }
     void toMSecsSinceEpochTz();
+#endif
     void setDate();
     void setTime();
+#if QT_DEPRECATED_SINCE(6, 9)
     void setTimeSpec();
     void setOffsetFromUtc();
+#endif
     void setMSecsSinceEpoch();
+#if QT_CONFIG(timezone)
     void setMSecsSinceEpochTz();
+#endif
     void toString();
     void toStringTextFormat();
     void toStringIsoFormat();
     void addDays();
+#if QT_CONFIG(timezone)
     void addDaysTz();
-    void addMSecs();
     void addMSecsTz();
+#endif
+    void addMSecs();
+#if QT_DEPRECATED_SINCE(6, 9)
     void toTimeSpec();
     void toOffsetFromUtc();
+#endif
     void daysTo();
     void msecsTo();
     void equivalent();
@@ -60,11 +73,12 @@ private Q_SLOTS:
     void fromStringIso();
     void fromMSecsSinceEpoch();
     void fromMSecsSinceEpochUtc();
+#if QT_CONFIG(timezone)
     void fromMSecsSinceEpochTz();
+#endif
 };
 
-constexpr qint64 SECS_PER_DAY = 86400;
-constexpr qint64 MSECS_PER_DAY = 86400000;
+using namespace QtPrivate::DateTimeConstants;
 constexpr qint64 JULIAN_DAY_1 = 1721426;
 constexpr qint64 JULIAN_DAY_11 = 1725078;
 constexpr qint64 JULIAN_DAY_1890 = 2411369;
@@ -98,7 +112,7 @@ QList<QDateTime> tst_QDateTime::daily(qint64 start, qint64 end)
         list.append(QDateTime(QDate::fromJulianDay(jd).startOfDay()));
     return list;
 }
-
+#if QT_CONFIG(timezone)
 QList<QDateTime> tst_QDateTime::norse(qint64 start, qint64 end)
 {
     const QTimeZone cet("Europe/Oslo");
@@ -108,7 +122,7 @@ QList<QDateTime> tst_QDateTime::norse(qint64 start, qint64 end)
         list.append(QDateTime(QDate::fromJulianDay(jd).startOfDay(cet)));
     return list;
 }
-
+#endif
 void tst_QDateTime::create()
 {
     QFETCH(const qint64, startJd);
@@ -195,7 +209,7 @@ void tst_QDateTime::toMSecsSinceEpoch()
             test.toMSecsSinceEpoch();
     }
 }
-
+#if QT_CONFIG(timezone)
 void tst_QDateTime::toMSecsSinceEpochTz()
 {
     QFETCH(const qint64, startJd);
@@ -209,7 +223,7 @@ void tst_QDateTime::toMSecsSinceEpochTz()
     }
     Q_UNUSED(result);
 }
-
+#endif
 void tst_QDateTime::setDate()
 {
     const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2020);
@@ -228,6 +242,9 @@ void tst_QDateTime::setTime()
     }
 }
 
+#if QT_DEPRECATED_SINCE(6, 9)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
 void tst_QDateTime::setTimeSpec()
 {
     const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2020);
@@ -245,6 +262,8 @@ void tst_QDateTime::setOffsetFromUtc()
             test.setOffsetFromUtc(3600);
     }
 }
+QT_WARNING_POP
+#endif // 6.9 deprecation
 
 void tst_QDateTime::setMSecsSinceEpoch()
 {
@@ -255,7 +274,7 @@ void tst_QDateTime::setMSecsSinceEpoch()
             test.setMSecsSinceEpoch(msecs);
     }
 }
-
+#if QT_CONFIG(timezone)
 void tst_QDateTime::setMSecsSinceEpochTz()
 {
     const qint64 msecs = qint64(JULIAN_DAY_2010 - JULIAN_DAY_1970 + 180) * MSECS_PER_DAY;
@@ -265,7 +284,7 @@ void tst_QDateTime::setMSecsSinceEpochTz()
             test.setMSecsSinceEpoch(msecs);
     }
 }
-
+#endif
 void tst_QDateTime::toString()
 {
     const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2011);
@@ -303,7 +322,7 @@ void tst_QDateTime::addDays()
     }
     Q_UNUSED(next);
 }
-
+#if QT_CONFIG(timezone)
 void tst_QDateTime::addDaysTz()
 {
     const auto list = norse(JULIAN_DAY_2010, JULIAN_DAY_2020);
@@ -312,7 +331,7 @@ void tst_QDateTime::addDaysTz()
             QDateTime result = test.addDays(1);
     }
 }
-
+#endif
 void tst_QDateTime::addMSecs()
 {
     const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2020);
@@ -323,7 +342,7 @@ void tst_QDateTime::addMSecs()
     }
     Q_UNUSED(next);
 }
-
+#if QT_CONFIG(timezone)
 void tst_QDateTime::addMSecsTz()
 {
     const auto list = norse(JULIAN_DAY_2010, JULIAN_DAY_2020);
@@ -332,7 +351,10 @@ void tst_QDateTime::addMSecsTz()
             QDateTime result = test.addMSecs(1);
     }
 }
-
+#endif
+#if QT_DEPRECATED_SINCE(6, 9)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
 void tst_QDateTime::toTimeSpec()
 {
     const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2020);
@@ -350,6 +372,8 @@ void tst_QDateTime::toOffsetFromUtc()
             test.toOffsetFromUtc(3600);
     }
 }
+QT_WARNING_POP
+#endif
 
 void tst_QDateTime::daysTo()
 {
@@ -390,7 +414,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 +440,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 +524,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,10 +534,10 @@ 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);
     }
 }
-
+#if QT_CONFIG(timezone)
 void tst_QDateTime::fromMSecsSinceEpochTz()
 {
     const int start = JULIAN_DAY_2010 - JULIAN_DAY_1970;
@@ -524,6 +548,7 @@ void tst_QDateTime::fromMSecsSinceEpochTz()
             QDateTime test = QDateTime::fromMSecsSinceEpoch(jd * MSECS_PER_DAY, cet);
     }
 }
+#endif
 
 QTEST_MAIN(tst_QDateTime)