diff options
| author | Alan Alpert <416365416c@gmail.com> | 2013-10-29 16:36:31 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-30 06:55:43 +0100 |
| commit | 2f26ea36375f8a04dac93cb3978804762ca06265 (patch) | |
| tree | aa460bf4ddc918b4c3af7a370722f02c1b283d05 /tests/auto/qml/qqmllocale | |
| parent | 1fc951da6aa0bff05af37b20744aba810a2d2988 (diff) | |
Fix qqmllocale test
Test was only passing the time to the format function, thinking it was
the only part under test, but the date is also relevant due to DST being
part of the formatted output.
Task-number: QTBUG-34406
Change-Id: I1f542b58907281632ee3c96b9b5b38426936953e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmllocale')
| -rw-r--r-- | tests/auto/qml/qqmllocale/tst_qqmllocale.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp index b92c722832..d565ad557c 100644 --- a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp +++ b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp @@ -889,10 +889,6 @@ void tst_qqmllocale::dateToLocaleTimeStringFormatted_data() void tst_qqmllocale::dateToLocaleTimeStringFormatted() { -#if defined(Q_OS_WIN) - // QTBUG-34406 - QSKIP("These tests are not DST-proof under Windows"); -#endif QFETCH(QString, locale); QFETCH(QString, format); @@ -914,7 +910,7 @@ void tst_qqmllocale::dateToLocaleTimeStringFormatted() Q_ARG(QVariant, QVariant(format))); QLocale l(locale); - QCOMPARE(val.toString(), l.toString(dt.time(), format)); + QCOMPARE(val.toString(), l.toString(dt, format)); } void tst_qqmllocale::dateFromLocaleString_data() |