diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-02-17 20:31:38 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-17 20:31:38 +0100 |
| commit | e88011357e5dd3b0ae4e6bc715ef29e5f4f3ffab (patch) | |
| tree | c5b05d45e49194d70ff4defae41e5d5d5cf75e80 /tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | |
| parent | 2df8884bc68343ad96962e7496b98d6e585c0347 (diff) | |
| parent | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/corelib/tools/qlocale/tst_qlocale.cpp')
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index 419b21c9e1..4138795973 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -1673,6 +1673,9 @@ void tst_QLocale::dateFormat() const QLocale ca("en_CA"); QCOMPARE(ca.dateFormat(QLocale::ShortFormat), QLatin1String("M/d/yy")); QCOMPARE(ca.dateFormat(QLocale::LongFormat), QLatin1String("dddd, MMMM d, yyyy")); + + const QLocale ja("ja_JP"); + QCOMPARE(ja.dateFormat(QLocale::ShortFormat), QLatin1String("yyyy/MM/dd")); } void tst_QLocale::timeFormat() @@ -1739,6 +1742,10 @@ void tst_QLocale::monthName() QLocale ir("ga_IE"); QCOMPARE(ir.monthName(1, QLocale::ShortFormat), QLatin1String("Ean")); QCOMPARE(ir.monthName(12, QLocale::ShortFormat), QLatin1String("Noll")); + + QLocale cz("cs_CZ"); + QCOMPARE(cz.monthName(1, QLocale::ShortFormat), QLatin1String("led")); + QCOMPARE(cz.monthName(12, QLocale::ShortFormat), QLatin1String("pro")); } void tst_QLocale::standaloneMonthName() |