1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QTzTimeZonePrivate::displayName()'s fallback

Browse Source 
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>
This commit is contained in:
Edward Welbourne 2021-01-14 16:18:59 +01:00 committed by Qt Cherry-pick Bot
parent 1580c84e1a
commit 90195292f9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/time/qtimezoneprivate_tz.cpp
View File

@ -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,