summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qlocale.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2010-01-08 11:55:25 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2010-01-08 11:55:25 (GMT)
commit30d45394f59c25fc2c3e7e30da4e49bf9744de76 (patch)
tree8483a7b767bb36023f90bca39f8512dc11553f22 /src/corelib/tools/qlocale.cpp
parentd170179f00effe691de23167e02ff5aeecaeb054 (diff)
parent2e62227f950aac8205f2b67e4d7d046836b2c799 (diff)
downloadQt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.zip
Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.gz
Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.bz2
Merge remote branch 'origin/master'
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
-rw-r--r--src/corelib/tools/qlocale.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index c2280c6..3a5de2d 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));