path: root/src/corelib/tools/
diff options
authorAlbert Astals Cid <>2013-04-18 18:58:18 +0200
committerThe Qt Project <>2013-05-01 21:05:33 +0200
commitb1de018e9a1efcd0f9e298ae4c865197feb47895 (patch)
treeba6a28fe97f638ffd2f0e826d665549a6615d9fe /src/corelib/tools/
parent05984c910fb6ab2670bbeefa87131a34537ea467 (diff)
Fix QLocale::standaloneMonthName when d->m_data == systemData()
At the moment if d->m_data == systemData() it calls systemLocale()->query but forgets about the standalone part so you get the wrong data This patch introduces the new enums so that backends can implement properly the standaloneMonthName feature properly. At the moment the Windows and Mac ones still return the monthName, the Unix and Blackberry ones return the data we store in months_data Change-Id: Idc5a50b04ab1f914f16c7385be1dca2e027feae3 Reviewed-by: Lars Knoll <> Reviewed-by: Rafael Roquetto <> Reviewed-by: Mehdi Fekari <> Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'src/corelib/tools/')
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/tools/ b/src/corelib/tools/
index 9292dccf19..f399b7689d 100644
--- a/src/corelib/tools/
+++ b/src/corelib/tools/
@@ -401,7 +401,9 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
return macDayName(in.toInt(), (type == DayNameShort));
case MonthNameLong:
case MonthNameShort:
- return macMonthName(in.toInt(), (type == MonthNameShort));
+ case StandaloneMonthNameLong:
+ case StandaloneMonthNameShort:
+ return macMonthName(in.toInt(), (type == MonthNameShort || type == StandaloneMonthNameShort));
case DateToStringShort:
case DateToStringLong:
return macDateToString(in.toDate(), (type == DateToStringShort));