summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Weimer <bweimer@blackberry.com>2014-02-13 12:19:10 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-14 10:51:44 +0100
commit3cdd0358b39bcb4e6db6fd64e616c1c258a1297e (patch)
tree2e26e2b949aaf6291bd70e6be6e5be5030d7d563
parentfa8e6d5083a01667bd5bdd3450ca5f883a068d10 (diff)
Fix QDateTime auto test
Conversion from UTC to local time will result in same datetime value, if local time is in UTC. Change-Id: Icd4ea57cb46cc97bcc8fce4f4e579bf64a4d4b10 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
-rw-r--r--tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index 3bd8a7526e..bda5fc707a 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -1629,7 +1629,8 @@ void tst_QDateTime::operator_eqeq_data()
QTest::newRow("data10") << dateTime3 << dateTime3c << true << false;
QTest::newRow("data11") << dateTime3 << dateTime3d << true << false;
QTest::newRow("data12") << dateTime3c << dateTime3d << true << false;
- QTest::newRow("data13") << dateTime3 << dateTime3e << false << false;
+ QTest::newRow("data13") << dateTime3 << dateTime3e
+ << (localTimeType == LocalTimeIsUtc) << false;
QTest::newRow("invalid == invalid") << invalidDateTime() << invalidDateTime() << true << false;
QTest::newRow("invalid == valid #1") << invalidDateTime() << dateTime1 << false << false;