diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-17 09:40:52 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-17 09:40:52 (GMT) |
| commit | dd678f7564955112b348a2fec56b29a8875e585e (patch) | |
| tree | d2415d20cb5a27c312150cd6ee93bce8d5129895 /src/corelib/tools | |
| parent | 7d6af0213ab4f8797f98d0beb659fcf2f78a361b (diff) | |
| parent | bc01bb10da23d0d2308cf02a16947be836bc9a21 (diff) | |
| download | Qt-dd678f7564955112b348a2fec56b29a8875e585e.zip Qt-dd678f7564955112b348a2fec56b29a8875e585e.tar.gz Qt-dd678f7564955112b348a2fec56b29a8875e585e.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 4a66b92..8645f17 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -1187,14 +1187,14 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const } case DateFormatLong: case DateFormatShort: - return macToQtFormat(getMacDateFormat(type == DateFormatShort + return getMacDateFormat(type == DateFormatShort ? kCFDateFormatterShortStyle - : kCFDateFormatterLongStyle)); + : kCFDateFormatterLongStyle); case TimeFormatLong: case TimeFormatShort: - return macToQtFormat(getMacTimeFormat(type == TimeFormatShort + return getMacTimeFormat(type == TimeFormatShort ? kCFDateFormatterShortStyle - : kCFDateFormatterLongStyle)); + : kCFDateFormatterLongStyle); case DayNameLong: case DayNameShort: return macDayName(in.toInt(), (type == DayNameShort)); |