diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-01-14 16:18:59 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-01-20 18:20:11 +0000 |
| commit | 90195292f93ed0c014974881cfe804258690e265 (patch) | |
| tree | d63122558e8a07771e369fa904d549a036fae59b | |
| parent | 1580c84e1a3c6658f317f7bc78c64575160c1d65 (diff) | |
Fix QTzTimeZonePrivate::displayName()'s fallback
It previously fell back on abbreviation, a very poor choice.
The base class does better than that, so use its implementation instead.
Change-Id: I47cbfce815cd8b2b533d9c6aeebcf398e5852d02
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit f9fff26b2db8152dcae26c92054f031bdebd7bc1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_tz.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp index 50f24346d5..938f8d119a 100644 --- a/src/corelib/time/qtimezoneprivate_tz.cpp +++ b/src/corelib/time/qtimezoneprivate_tz.cpp @@ -902,7 +902,8 @@ QString QTzTimeZonePrivate::displayName(qint64 atMSecsSinceEpoch, Q_UNUSED(nameType); Q_UNUSED(locale); #endif - return abbreviation(atMSecsSinceEpoch); + // Fall back to base-class: + return QTimeZonePrivate::displayName(atMSecsSinceEpoch, nameType, locale); } QString QTzTimeZonePrivate::displayName(QTimeZone::TimeType timeType, |