diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:41:27 +0100 |
---|---|---|
committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:41:27 +0100 |
commit | c808dd27459e030fde0577feb8ba06e3bd465526 (patch) | |
tree | 4bf898dc4a88e2b03c9716f940638a2e01c6c0ce /tests/auto/corelib/thread/qfuture/tst_qfuture.cpp | |
parent | d9d8845d507a6bdbc9c9f24c0d9d86dca513461d (diff) | |
parent | 300534fc214f2547a63594ce0891e9a54c8f33ca (diff) |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocs
Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17
Diffstat (limited to 'tests/auto/corelib/thread/qfuture/tst_qfuture.cpp')
-rw-r--r-- | tests/auto/corelib/thread/qfuture/tst_qfuture.cpp | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index 81ba1b0fd9..6d73755cfc 100644 --- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -1251,18 +1251,32 @@ void tst_QFuture::throttling() void tst_QFuture::voidConversions() { - QFutureInterface<int> iface; - iface.reportStarted(); + { + QFutureInterface<int> iface; + iface.reportStarted(); - QFuture<int> intFuture(&iface); + QFuture<int> intFuture(&iface); + int value = 10; + iface.reportFinished(&value); - int value = 10; - iface.reportFinished(&value); + QFuture<void> voidFuture(intFuture); + voidFuture = intFuture; + + QVERIFY(voidFuture == intFuture); + } - QFuture<void> voidFuture(intFuture); - voidFuture = intFuture; + { + QFuture<void> voidFuture; + { + QFutureInterface<QList<int> > iface; + iface.reportStarted(); - QVERIFY(voidFuture == intFuture); + QFuture<QList<int> > listFuture(&iface); + iface.reportResult(QList<int>() << 1 << 2 << 3); + voidFuture = listFuture; + } + QCOMPARE(voidFuture.resultCount(), 0); + } } |