diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2024-02-02 15:32:36 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2024-02-05 23:12:59 +0100 |
| commit | bd07335554f0e2a48ea3fbda1258f3a9cdba17e7 (patch) | |
| tree | 7e854053788e97785709e7be79d521ec48585485 /src/corelib/time | |
| parent | 56d8a751cb6c489f623634b72fd89ffbf55c1c1b (diff) | |
Use short name as QTZP::abbreviation() by default
Also use C locale for this, rather than QLocale().
This makes the ICU backend's override redundant.
Change-Id: I3d668dd3a784b48d0a5fff7d11cc25a6e1423c84
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/time')
| -rw-r--r-- | src/corelib/time/qtimezoneprivate.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_icu.cpp | 9 | ||||
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_p.h | 1 |
3 files changed, 1 insertions, 12 deletions
diff --git a/src/corelib/time/qtimezoneprivate.cpp b/src/corelib/time/qtimezoneprivate.cpp index 9f88c86a78..c43e215739 100644 --- a/src/corelib/time/qtimezoneprivate.cpp +++ b/src/corelib/time/qtimezoneprivate.cpp @@ -190,8 +190,7 @@ QString QTimeZonePrivate::displayName(QTimeZone::TimeType timeType, QString QTimeZonePrivate::abbreviation(qint64 atMSecsSinceEpoch) const { - Q_UNUSED(atMSecsSinceEpoch); - return QString(); + return displayName(atMSecsSinceEpoch, QTimeZone::ShortName, QLocale::c()); } int QTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const diff --git a/src/corelib/time/qtimezoneprivate_icu.cpp b/src/corelib/time/qtimezoneprivate_icu.cpp index c071e7d549..d2e2ba98ac 100644 --- a/src/corelib/time/qtimezoneprivate_icu.cpp +++ b/src/corelib/time/qtimezoneprivate_icu.cpp @@ -314,15 +314,6 @@ QString QIcuTimeZonePrivate::displayName(QTimeZone::TimeType timeType, return ucalTimeZoneDisplayName(m_ucal, timeType, nameType, locale.name()); } -QString QIcuTimeZonePrivate::abbreviation(qint64 atMSecsSinceEpoch) const -{ - // TODO No ICU API, use short name instead - if (isDaylightTime(atMSecsSinceEpoch)) - return displayName(QTimeZone::DaylightTime, QTimeZone::ShortName, QLocale()); - else - return displayName(QTimeZone::StandardTime, QTimeZone::ShortName, QLocale()); -} - int QIcuTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const { int stdOffset = 0; diff --git a/src/corelib/time/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h index 4942ecd477..555114f140 100644 --- a/src/corelib/time/qtimezoneprivate_p.h +++ b/src/corelib/time/qtimezoneprivate_p.h @@ -216,7 +216,6 @@ public: using QTimeZonePrivate::displayName; QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, const QLocale &locale) const override; - QString abbreviation(qint64 atMSecsSinceEpoch) const override; int offsetFromUtc(qint64 atMSecsSinceEpoch) const override; int standardTimeOffset(qint64 atMSecsSinceEpoch) const override; |