From 282d81e4e53c41f2b89a41c01e149ef484460df7 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 28 Jun 2012 15:53:41 +0200 Subject: Write qHash functions for QDate, QTime and QDateTime. These functions didn't exist - this patch implements them. Task-number: QTBUG-23079 Change-Id: I9eb6e238531d5cda878f5f2cdd27bab30aa60669 Reviewed-by: Thiago Macieira --- tests/auto/corelib/tools/qdate/tst_qdate.cpp | 2 ++ tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp | 5 ++++- tests/auto/corelib/tools/qtime/tst_qtime.cpp | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'tests/auto/corelib/tools') diff --git a/tests/auto/corelib/tools/qdate/tst_qdate.cpp b/tests/auto/corelib/tools/qdate/tst_qdate.cpp index bbb199082f..e97025c6b6 100644 --- a/tests/auto/corelib/tools/qdate/tst_qdate.cpp +++ b/tests/auto/corelib/tools/qdate/tst_qdate.cpp @@ -712,6 +712,8 @@ void tst_QDate::operator_eq_eq() bool notEqual = d1 != d2; QCOMPARE(notEqual, !expectEqual); + if (equal) + QVERIFY(qHash(d1) == qHash(d2)); } void tst_QDate::operator_lt() diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp index 17c3c5b576..6327e73ba5 100644 --- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp @@ -1212,7 +1212,10 @@ void tst_QDateTime::operator_eqeq() bool notEqual = dt1 != dt2; QCOMPARE(notEqual, !expectEqual); - if (checkEuro) { + if (equal) + QVERIFY(qHash(dt1) == qHash(dt2)); + + if (checkEuro && europeanTimeZone) { QVERIFY(dt1.toUTC() == dt2); QVERIFY(dt1 == dt2.toLocalTime()); } diff --git a/tests/auto/corelib/tools/qtime/tst_qtime.cpp b/tests/auto/corelib/tools/qtime/tst_qtime.cpp index 77fd89f309..9a49dac785 100644 --- a/tests/auto/corelib/tools/qtime/tst_qtime.cpp +++ b/tests/auto/corelib/tools/qtime/tst_qtime.cpp @@ -370,6 +370,8 @@ void tst_QTime::operator_eq_eq() bool notEqual = t1 != t2; QCOMPARE(notEqual, !expectEqual); + if (equal) + QVERIFY(qHash(t1) == qHash(t2)); } void tst_QTime::operator_lt() -- cgit v1.2.3