From b428e98052aa1b97a42f31ed52b1266d17e186ee Mon Sep 17 00:00:00 2001 From: Andrei Golubev Date: Thu, 23 Apr 2020 17:11:40 +0300 Subject: Make qtbase compile without QT_CONFIG(timezone) Fixes: QTBUG-83795 Pick-to: 5.15 Change-Id: I05eaaf57d87a9111d3609ebab81bc707f8af98f0 Reviewed-by: Qt CI Bot Reviewed-by: Edward Welbourne --- tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp') diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index 0243b587b2..a9d2b413f0 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -1605,7 +1605,9 @@ void tst_QItemDelegate::dateTextForRole_data() // Ensure we exercise every time-spec variant: QTest::newRow("local") << QDateTime(date, time, Qt::LocalTime); QTest::newRow("UTC") << QDateTime(date, time, Qt::UTC); +#if QT_CONFIG(timezone) QTest::newRow("zone") << QDateTime(date, time, QTimeZone("Europe/Dublin")); +#endif QTest::newRow("offset") << QDateTime(date, time, Qt::OffsetFromUTC, 36000); #endif } -- cgit v1.2.3