From c7f14deb7c9b517edaa8548f387d6eae1663ec7b Mon Sep 17 00:00:00 2001 From: Andrei Golubev Date: Wed, 22 Apr 2020 17:38:37 +0300 Subject: Teach QDateTimeParser some common time-zone offset formats Fixes: QTBUG-83687 Fixes: QTBUG-83844 Change-Id: Ia1c827017b93cf8277aa5a0266805d773d2d9818 Reviewed-by: Edward Welbourne (cherry picked from commit bed25fdf6065d7137fa5610e4f214e9a8f8e172b) --- src/corelib/time/qdatetime.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/time/qdatetime.cpp') diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 0c9da44576..1c6b8eb9b9 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -2737,7 +2737,7 @@ static QString qt_tzname(QDateTimePrivate::DaylightStatus daylightStatus) #endif // Q_OS_WIN } -#if QT_CONFIG(datetimeparser) && QT_CONFIG(timezone) +#if QT_CONFIG(datetimeparser) /* \internal Implemented here to share qt_tzname() @@ -2755,7 +2755,7 @@ int QDateTimeParser::startsWithLocalTimeZone(const QStringRef name) } return 0; } -#endif // datetimeparser && timezone +#endif // datetimeparser // Calls the platform variant of mktime for the given date, time and daylightStatus, // and updates the date, time, daylightStatus and abbreviation with the returned values -- cgit v1.2.1