diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/time/qtimezoneprivate_android.cpp | 21 | ||||
-rw-r--r-- | src/corelib/time/qtimezoneprivate_p.h | 4 |
2 files changed, 2 insertions, 23 deletions
diff --git a/src/corelib/time/qtimezoneprivate_android.cpp b/src/corelib/time/qtimezoneprivate_android.cpp index 20f7f2df68..d10433ff23 100644 --- a/src/corelib/time/qtimezoneprivate_android.cpp +++ b/src/corelib/time/qtimezoneprivate_android.cpp @@ -229,25 +229,8 @@ QTimeZonePrivate::Data QAndroidTimeZonePrivate::data(qint64 forMSecsSinceEpoch) } } -bool QAndroidTimeZonePrivate::hasTransitions() const -{ - // java.util.TimeZone does not directly provide transitions - return false; -} - -QTimeZonePrivate::Data QAndroidTimeZonePrivate::nextTransition(qint64 afterMSecsSinceEpoch) const -{ - // transitions not available on Android, so return an invalid data object - Q_UNUSED( afterMSecsSinceEpoch ); - return invalidData(); -} - -QTimeZonePrivate::Data QAndroidTimeZonePrivate::previousTransition(qint64 beforeMSecsSinceEpoch) const -{ - // transitions not available on Android, so return an invalid data object - Q_UNUSED( beforeMSecsSinceEpoch ); - return invalidData(); -} +// java.util.TimeZone does not directly provide transitions, +// so don't over-ride QTZP's base implementation of transition methods. QByteArray QAndroidTimeZonePrivate::systemTimeZoneId() const { diff --git a/src/corelib/time/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h index b6ae3764b1..4fcf4cf32c 100644 --- a/src/corelib/time/qtimezoneprivate_p.h +++ b/src/corelib/time/qtimezoneprivate_p.h @@ -485,10 +485,6 @@ public: Data data(qint64 forMSecsSinceEpoch) const override; - bool hasTransitions() const override; - Data nextTransition(qint64 afterMSecsSinceEpoch) const override; - Data previousTransition(qint64 beforeMSecsSinceEpoch) const override; - QByteArray systemTimeZoneId() const override; QList<QByteArray> availableTimeZoneIds() const override; |