diff options
| author | Andrei Golubev <andrei.golubev@qt.io> | 2020-04-22 17:38:37 +0300 |
|---|---|---|
| committer | Andrei Golubev <andrei.golubev@qt.io> | 2020-05-12 12:45:58 +0300 |
| commit | bed25fdf6065d7137fa5610e4f214e9a8f8e172b (patch) | |
| tree | 6d381eb6c8bdf68dfe2a9ecf2812cfca488210cb /src/corelib/time/qdatetime.cpp | |
| parent | ed4c1b4e90aa5cb7ce6e904667bbdd6131ce7307 (diff) | |
Teach QDateTimeParser some common time-zone offset formats
Fixes: QTBUG-83687
Fixes: QTBUG-83844
Pick-to: 5.15
Change-Id: Ia1c827017b93cf8277aa5a0266805d773d2d9818
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/time/qdatetime.cpp')
| -rw-r--r-- | src/corelib/time/qdatetime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 9c10e7fe39..50825182a9 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -2382,7 +2382,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() @@ -2400,7 +2400,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 |