diff -r 56cd8111b7f7 -r 41300fa6a67c src/corelib/tools/qlocale.cpp --- a/src/corelib/tools/qlocale.cpp Tue Jan 26 12:42:25 2010 +0200 +++ b/src/corelib/tools/qlocale.cpp Tue Feb 02 00:43:10 2010 +0200 @@ -1187,14 +1187,14 @@ } 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));