path: root/src/corelib/tools/qtimezoneprivate_p.h
diff options
authorJohn Layt <>2013-09-20 18:35:08 +0200
committerThe Qt Project <>2013-11-21 09:25:23 +0100
commit8e6258f059140ce735391b6438d5976dc9469e95 (patch)
tree463f8f17ac333f0e035ee5f1779355b0294a51de /src/corelib/tools/qtimezoneprivate_p.h
parentc03ea9be38a3c23b54e56bb567205a02ad4d1e19 (diff)
QTimeZone - Fix TZ file abbreviations
Fix parsing of TZ file abbreviations, to correctly return cases where POSIX rule doesn't have separate DST rules, and where abbreviation is a sub-string of another abbreviation, otherwise any toString() call will crash. Add test to exercise all available time zones, especially useful for TZ file to confirm all file format variations dealt with. Fix parsing of Version 3 of TZ file, and ICU display name, to allow all files generated from release 2013f to pass, otherwise isValid() call will crash. Task-number: QTBUG-34061 Change-Id: Ie0b6abc218adff1c8967eb33fdb0762041d2305f Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'src/corelib/tools/qtimezoneprivate_p.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/tools/qtimezoneprivate_p.h b/src/corelib/tools/qtimezoneprivate_p.h
index 186a352a2f..108aec2654 100644
--- a/src/corelib/tools/qtimezoneprivate_p.h
+++ b/src/corelib/tools/qtimezoneprivate_p.h
@@ -309,6 +309,7 @@ private:
bool operator==(const QTzTransitionRule &other) { return (stdOffset == other.stdOffset
&& dstOffset == other.dstOffset && abbreviationIndex == other.abbreviationIndex); }
+ Data dataForTzTransition(QTzTransitionTime tran) const;
QList<QTzTransitionTime> m_tranTimes;
QList<QTzTransitionRule> m_tranRules;
QList<QByteArray> m_abbreviations;