From 1d725c00949eb0b92f20a3c3e51cf70bc422aaf8 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 28 Aug 2024 11:21:10 +0200 Subject: [PATCH] Mention GMT-offset form of short-names for timezones This fixes the documentation side of an issue with QTZ::displayName() not doing what's documented. (The MS-eccentricities have been fixed by earlier work.) Fixes: QTBUG-84297 Change-Id: I3ec522aa81741fbf2d3dd247786310304e14f304 Reviewed-by: Ivan Solovev (cherry picked from commit b3a00a38af1226ebd6617638872d540f1ecd76df) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/time/qtimezone.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/corelib/time/qtimezone.cpp b/src/corelib/time/qtimezone.cpp index f71d7288050..b174ade1804 100644 --- a/src/corelib/time/qtimezone.cpp +++ b/src/corelib/time/qtimezone.cpp @@ -302,11 +302,14 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz); The type of time zone name. \value DefaultName - The default form of the time zone name, e.g. LongName, ShortName or OffsetName + The default form of the time zone name, one of LongName, ShortName or + OffsetName \value LongName The long form of the time zone name, e.g. "Central European Time" \value ShortName - The short form of the time zone name, usually an abbreviation, e.g. "CET" + The short form of the time zone name, usually an abbreviation, + e.g. "CET", in locales that have one for the zone, otherwise a + compact GMT-offset form, e.g. "GMT+1" \value OffsetName The standard ISO offset form of the time zone name, e.g. "UTC+01:00"