diff options
| author | Drew Parsons <dparsons@emerall.com> | 2014-12-07 11:46:18 +1100 |
|---|---|---|
| committer | Drew Parsons <dparsons@emerall.com> | 2014-12-11 22:18:21 +0100 |
| commit | 0478bc15bd3b4c616b4860e460600ba8877ee216 (patch) | |
| tree | 303f50c8798eb9f91b3efb9dcd23a5d05402b627 /src/corelib/tools/qtimezoneprivate_p.h | |
| parent | c9b99994b0bbd5160055314e753592f5e46f63fb (diff) | |
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 <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/corelib/tools/qtimezoneprivate_p.h')
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
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<QByteArray> availableTimeZoneIds() const Q_DECL_OVERRIDE; |