diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2021-09-03 11:17:25 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-09-15 10:30:01 +0200 |
| commit | cc22857d1e2e447111d2161e4d17934a8449774f (patch) | |
| tree | 01ff1d19e6e465a40a6ff9f2d0565e2e788461eb /src/plugins/platforms/android | |
| parent | 61343b5a3f10f5b9166729176d4b95a4c538c278 (diff) | |
QAndroidSystemLocale: add missing day and month format handling
This patch adds support for previously missing Narrow format, as well
as standalone day name handling for QAndroidSystemLocale
Task-number: QTBUG-84877
Pick-to: 6.2
Change-Id: Ib74fb8f0e12f03ab96022abaf26ac9039ffaa60b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/plugins/platforms/android')
| -rw-r--r-- | src/plugins/platforms/android/qandroidsystemlocale.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidsystemlocale.cpp b/src/plugins/platforms/android/qandroidsystemlocale.cpp index 351274a560..74a549454d 100644 --- a/src/plugins/platforms/android/qandroidsystemlocale.cpp +++ b/src/plugins/platforms/android/qandroidsystemlocale.cpp @@ -105,14 +105,26 @@ QVariant QAndroidSystemLocale::query(QueryType type, QVariant in) const return m_locale.dayName(in.toInt(), QLocale::LongFormat); case DayNameShort: return m_locale.dayName(in.toInt(), QLocale::ShortFormat); + case DayNameNarrow: + return m_locale.dayName(in.toInt(), QLocale::NarrowFormat); + case StandaloneDayNameLong: + return m_locale.standaloneDayName(in.toInt(), QLocale::LongFormat); + case StandaloneDayNameShort: + return m_locale.standaloneDayName(in.toInt(), QLocale::ShortFormat); + case StandaloneDayNameNarrow: + return m_locale.standaloneDayName(in.toInt(), QLocale::NarrowFormat); case MonthNameLong: return m_locale.monthName(in.toInt(), QLocale::LongFormat); case MonthNameShort: return m_locale.monthName(in.toInt(), QLocale::ShortFormat); + case MonthNameNarrow: + return m_locale.monthName(in.toInt(), QLocale::NarrowFormat); case StandaloneMonthNameLong: return m_locale.standaloneMonthName(in.toInt(), QLocale::LongFormat); case StandaloneMonthNameShort: return m_locale.standaloneMonthName(in.toInt(), QLocale::ShortFormat); + case StandaloneMonthNameNarrow: + return m_locale.standaloneMonthName(in.toInt(), QLocale::NarrowFormat); case DateToStringLong: return m_locale.toString(in.toDate(), QLocale::LongFormat); case DateToStringShort: |