From 919d2e0c5a844da1ca87b554fb7b8060a520e640 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 24 Mar 2023 15:09:48 +0100 Subject: [PATCH] Correct time zone in tst_QDateTimeEdit::stepIntoDSTGap() Given that QDTE only supports local time and UTC, using Europe/Oslo as zone was disconnected from reality, especially as various QDateTime()s were constructed using local time. Use the system zone. Pick-to: 6.5 6.2 Change-Id: I95b3a6a6acf9ffc2b8c7f05d3dd9440ff173abfe Reviewed-by: Volker Hilsheimer --- tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index 59ec032c48..ddebea0e82 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -4697,7 +4697,7 @@ void tst_QDateTimeEdit::stepIntoDSTGap_data() QTest::addColumn("steps"); QTest::addColumn("end"); - const QTimeZone timeZone = QTimeZone("Europe/Oslo"); + const QTimeZone timeZone = QTimeZone::systemTimeZone(); if (!timeZone.hasDaylightTime()) QSKIP("This test needs to run in a timezone that observes DST!");