From f9fff26b2db8152dcae26c92054f031bdebd7bc1 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 14 Jan 2021 16:18:59 +0100 Subject: 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 --- src/corelib/time/qtimezoneprivate_tz.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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, -- cgit v1.2.3