summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-09-27 11:14:48 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-09-27 11:15:09 +0200
commit16a36239ab9e9be45a940aeff94f35e29bdeb944 (patch)
treeed6c159f12fa2ff80cf39b97a65eab0546ffe639 /tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
parente37001aad7f6e4bbad250addba033f1eaf97d566 (diff)
parent00da2e615e89c46affbc130b4df6148785724a23 (diff)
Merge branch 'stable' into dev
Diffstat (limited to 'tests/auto/corelib/tools/qlocale/tst_qlocale.cpp')
-rw-r--r--tests/auto/corelib/tools/qlocale/tst_qlocale.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index 8411cfe29b..d6dea05755 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -1407,10 +1407,7 @@ void tst_QLocale::macDefaultLocale()
QCOMPARE(locale.decimalPoint(), QChar('.'));
QCOMPARE(locale.groupSeparator(), QChar(','));
QCOMPARE(locale.dateFormat(QLocale::ShortFormat), QString("M/d/yy"));
- if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_6)
- QCOMPARE(locale.dateFormat(QLocale::LongFormat), QString("MMMM d, y"));
- else
- QCOMPARE(locale.dateFormat(QLocale::LongFormat), QString("MMMM d, yyyy"));
+ QCOMPARE(locale.dateFormat(QLocale::LongFormat), QString("MMMM d, yyyy"));
QCOMPARE(locale.timeFormat(QLocale::ShortFormat), QString("h:mm AP"));
QCOMPARE(locale.timeFormat(QLocale::LongFormat), QString("h:mm:ss AP t"));