From 0478bc15bd3b4c616b4860e460600ba8877ee216 Mon Sep 17 00:00:00 2001 From: Drew Parsons Date: Sun, 7 Dec 2014 11:46:18 +1100 Subject: fix daylight time in QTimeZone on Android Android does not provide an API to access daylight time transitions, so the standard QTimeZonePrivate::dataForLocalTime only returns standard time without the daylight offset Therefore provide an override, QAndroidTimeZonePrivate::dataForLocalTime, which tests daylight time offsets directly rather than using transitions. Change-Id: Ia8adaf9af40da38aadfa7d22d9a3fe9da9ba24a8 Reviewed-by: Oswald Buddenhagen Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/corelib/tools/qtimezoneprivate_p.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/corelib/tools/qtimezoneprivate_p.h') diff --git a/src/corelib/tools/qtimezoneprivate_p.h b/src/corelib/tools/qtimezoneprivate_p.h index 486f9c1ffa..6494ffe148 100644 --- a/src/corelib/tools/qtimezoneprivate_p.h +++ b/src/corelib/tools/qtimezoneprivate_p.h @@ -458,6 +458,8 @@ public: Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE; + Data dataForLocalTime(qint64 forLocalMSecs) const Q_DECL_OVERRIDE; + QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; QSet availableTimeZoneIds() const Q_DECL_OVERRIDE; -- cgit v1.2.3