summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2021-01-14 16:18:59 +0100
committerThiago Macieira <thiago.macieira@intel.com>2021-01-20 14:18:46 +0000
commitf9fff26b2db8152dcae26c92054f031bdebd7bc1 (patch)
tree7bbc1a681933bbdcea26b4533245de8ce9b53666
parentdf788cca8bb4bc85e9b2d78aa6afe165f5ce30e5 (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. Pick-to: 6.0 Change-Id: I47cbfce815cd8b2b533d9c6aeebcf398e5852d02 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/time/qtimezoneprivate_tz.cpp3
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,