diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:14:48 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:15:09 +0200 |
commit | 16a36239ab9e9be45a940aeff94f35e29bdeb944 (patch) | |
tree | ed6c159f12fa2ff80cf39b97a65eab0546ffe639 /tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | |
parent | e37001aad7f6e4bbad250addba033f1eaf97d566 (diff) | |
parent | 00da2e615e89c46affbc130b4df6148785724a23 (diff) |
Merge branch 'stable' into dev
Change-Id: I06694436322a7810a163b27b8a059cee2b046f06
Diffstat (limited to 'tests/auto/corelib/tools/qlocale/tst_qlocale.cpp')
-rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 5 |
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")); |