diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2021-09-02 14:52:25 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-09-06 20:40:12 +0200 |
| commit | 78dee15da43597126d0a8579cf5db3ec4f019ca8 (patch) | |
| tree | 3d70687ba15fc5a1520070f666b7b772fbd74786 /src/corelib/text/qlocale.cpp | |
| parent | 71cc5e3ed54c17dfe91880b4dffefc2081fd13d6 (diff) | |
Fix QLocale::system() standalone day and month handling
Some backends were missing support for standalone days and months,
also the standaloneDayName() implementation was always using the
same codepath as dayName().
This patch fixes the issues.
Support for narrow format will be added in the following patch.
Task-number: QTBUG-84877
Pick-to: 6.2
Change-Id: I38ee06342cafab544e3c69097bd0e6ae68e85645
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/text/qlocale.cpp')
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 145a2439e5..1060f5a678 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -2954,8 +2954,8 @@ QString QCalendarBackend::standaloneWeekDayName(const QLocale &locale, int day, #ifndef QT_NO_SYSTEMLOCALE if (locale.d->m_data == &systemLocaleData) { QVariant res = systemLocale()->query(format == QLocale::LongFormat - ? QSystemLocale::DayNameLong - : QSystemLocale::DayNameShort, + ? QSystemLocale::StandaloneDayNameLong + : QSystemLocale::StandaloneDayNameShort, day); if (!res.isNull()) return res.toString(); |