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/qdatetimeparser_p.h | |
| 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/qdatetimeparser_p.h')
| -rw-r--r-- | src/corelib/time/qdatetimeparser_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/time/qdatetimeparser_p.h b/src/corelib/time/qdatetimeparser_p.h index caef0403bc..535069b7b2 100644 --- a/src/corelib/time/qdatetimeparser_p.h +++ b/src/corelib/time/qdatetimeparser_p.h @@ -220,12 +220,12 @@ private: int year, QString *monthName = nullptr, int *used = nullptr) const; int findDay(const QString &str1, int intDaystart, int sectionIndex, QString *dayName = nullptr, int *used = nullptr) const; + ParsedSection findUtcOffset(QStringRef str) const; + ParsedSection findTimeZoneName(QStringRef str, const QDateTime &when) const; ParsedSection findTimeZone(QStringRef str, const QDateTime &when, int maxVal, int minVal) const; -#if QT_CONFIG(timezone) // Implemented in qdatetime.cpp: static int startsWithLocalTimeZone(const QStringRef name); -#endif enum AmPmFinder { Neither = -1, |