diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-10-29 12:41:11 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-29 14:19:35 +0100 |
commit | 30a1683f65fa0d01eceb7e1293abc84108d76e7f (patch) | |
tree | 692bb6f8d135ae486f07fcc890f190874710d664 /tests/auto | |
parent | 387f3e00a8d74984d33af990a1e1f57cd87aae61 (diff) |
Remove the comparison operators of QFuture
These operators don't do what the user might expect and may lead to
confusing results.
[ChangeLog][Source-Incompatible Changes][QFuture] The comparison
operators of QFuture have been removed. They were comparing the
underlying d-ptrs instead of comparing the results (as the users
might expect), which is not very helpful for the users point of view.
Change-Id: I80a887610eac38b60329128cca52cdb5fb515207
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/corelib/thread/qfuture/tst_qfuture.cpp | 2 | ||||
-rw-r--r-- | tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index 2d78af8f94..0faa8e0be7 100644 --- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -1504,8 +1504,6 @@ void tst_QFuture::voidConversions() QFuture<void> voidFuture(intFuture); voidFuture = intFuture; - - QVERIFY(voidFuture == intFuture); } { diff --git a/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp b/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp index 2a8a340925..a05687f4e5 100644 --- a/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp +++ b/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp @@ -107,7 +107,7 @@ void tst_QFutureSynchronizer::futures() synchronizer.addFuture(future); } - QCOMPARE(futures, synchronizer.futures()); + QCOMPARE(futures.count(), synchronizer.futures().count()); } void tst_QFutureSynchronizer::setFuture() @@ -122,7 +122,6 @@ void tst_QFutureSynchronizer::setFuture() QFuture<void> future; synchronizer.setFuture(future); QCOMPARE(synchronizer.futures().size(), 1); - QCOMPARE(synchronizer.futures().first(), future); } void tst_QFutureSynchronizer::waitForFinished() |