diff options
| author | Andrei Golubev <andrei.golubev@qt.io> | 2020-04-23 17:11:40 +0300 |
|---|---|---|
| committer | Andrei Golubev <andrei.golubev@qt.io> | 2020-05-11 14:42:00 +0300 |
| commit | b428e98052aa1b97a42f31ed52b1266d17e186ee (patch) | |
| tree | d6ce2fefdef8279b986239b2f09a5c3fa36da473 /src/widgets/widgets/qdatetimeedit.cpp | |
| parent | 255cc55d74b55dfbecd9af0ea8d39aaf181da4ce (diff) | |
Make qtbase compile without QT_CONFIG(timezone)
Fixes: QTBUG-83795
Pick-to: 5.15
Change-Id: I05eaaf57d87a9111d3609ebab81bc707f8af98f0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/widgets/widgets/qdatetimeedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 8db5a12a4b..5d64aad040 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -1728,9 +1728,12 @@ QDateTime QDateTimeEditPrivate::convertTimeSpec(const QDateTime &datetime) return datetime.toLocalTime(); case Qt::OffsetFromUTC: return datetime.toOffsetFromUtc(value.toDateTime().offsetFromUtc()); -#if QT_CONFIG(timezone) case Qt::TimeZone: +#if QT_CONFIG(timezone) return datetime.toTimeZone(value.toDateTime().timeZone()); +#else + qWarning("QDateTimeEdit: Internal: enable timezone feature to support Qt::TimeZone"); + return datetime; #endif } Q_UNREACHABLE(); |