From 6a3509baa20ba049b84a7774a9b270bb81748148 Mon Sep 17 00:00:00 2001
From: Tatiana Borisova <tatiana.borisova@qt.io>
Date: Thu, 18 Aug 2022 13:15:09 +0300
Subject: Put code related to timezone functionality under QT_CONFIG(timezone)

Pick-to: 6.4 6.3
Change-Id: I0d1573dbb4ae4f9740fc19546950ae4316aa4c0c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 tests/auto/corelib/time/qdate/tst_qdate.cpp         | 2 ++
 tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'tests/auto/corelib/time')

diff --git a/tests/auto/corelib/time/qdate/tst_qdate.cpp b/tests/auto/corelib/time/qdate/tst_qdate.cpp
index b17054c240..50870244b5 100644
--- a/tests/auto/corelib/time/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/time/qdate/tst_qdate.cpp
@@ -4,7 +4,9 @@
 
 #include <private/qglobal_p.h> // for the icu feature test
 #include <QTest>
+#if QT_CONFIG(timezone)
 #include <QTimeZone>
+#endif
 #include <qdatetime.h>
 #include <qlocale.h>
 #include <QMap>
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
index e9d2064503..17e59a2c18 100644
--- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
@@ -2507,11 +2507,13 @@ void tst_QDateTime::fromStringDateFormat_data()
     // 24:00:00 Should be next day according to ISO 8601 section 4.2.3.
     QTest::newRow("ISO 24:00") << QString::fromLatin1("2012-06-04T24:00:00")
         << Qt::ISODate << QDateTime(QDate(2012, 6, 5), QTime(0, 0), Qt::LocalTime);
+#if QT_CONFIG(timezone)
     QTest::newRow("ISO 24:00 in DST") // Only special if TZ=America/Sao_Paulo
         << QString::fromLatin1("2008-10-18T24:00") << Qt::ISODate
         << QDateTime(QDate(2008, 10, 19),
                      QTime(QTimeZone::systemTimeZoneId() == "America/Sao_Paulo" ? 1 : 0, 0),
                      Qt::LocalTime);
+#endif
     QTest::newRow("ISO 24:00 end of month") << QString::fromLatin1("2012-06-30T24:00:00")
         << Qt::ISODate << QDateTime(QDate(2012, 7, 1), QTime(0, 0), Qt::LocalTime);
     QTest::newRow("ISO 24:00 end of year") << QString::fromLatin1("2012-12-31T24:00:00")
-- 
cgit v1.2.3