summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2011-02-25 10:53:05 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2011-02-25 10:53:05 (GMT)
commitc4b61c27ad0e0af16f0bbf91e965646c82394584 (patch)
tree4e55b3e83353ef7d49fee0fccdca7a994196d379 /src
parent172e9cda6a8e2a0fa853f3c76bc8345a55e496d8 (diff)
downloadQt-c4b61c27ad0e0af16f0bbf91e965646c82394584.zip
Qt-c4b61c27ad0e0af16f0bbf91e965646c82394584.tar.gz
Qt-c4b61c27ad0e0af16f0bbf91e965646c82394584.tar.bz2
Implemented retrieving AM/PM text on Mac.
Reviewed-by: trustme
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qlocale_mac.mm9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm
index 5210a6e..0126a28 100644
--- a/src/corelib/tools/qlocale_mac.mm
+++ b/src/corelib/tools/qlocale_mac.mm
@@ -449,8 +449,13 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
return QVariant(static_cast<int>(macMeasurementSystem()));
case AMText:
- case PMText:
- break;
+ case PMText: {
+ QCFType<CFLocaleRef> locale = CFLocaleCopyCurrent();
+ QCFType<CFDateFormatterRef> formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterLongStyle, kCFDateFormatterLongStyle);
+ QCFType<CFStringRef> value = static_cast<CFStringRef>(CFDateFormatterCopyProperty(formatter,
+ (type == AMText ? kCFDateFormatterAMSymbol : kCFDateFormatterPMSymbol)));
+ return QCFString::toQString(value);
+ }
case FirstDayOfWeek:
return QVariant(macFirstDayOfWeek());
case CurrencySymbol: