diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-10-09 14:34:08 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-10-12 13:51:34 +0200 |
| commit | 3d040267f436e4f28819e1b5f362a1a908dceea5 (patch) | |
| tree | 2cc70b33914dcb85f19171b6e702b11fb590cf26 /tests/auto/corelib/thread | |
| parent | 4897aa8b5fdba8ae4b56fdad1ff923f6a6faf882 (diff) | |
Temporarily disable QFuture::takeResult() method
QFuture::takeResult() currently returns std::vector instead of QList,
because QList does not support move-only types. Disable this method
until QList is fixed to work with move-only types in Qt 6.1.
Also did minor doc-fixes.
Change-Id: I87feaf75d9433a3b540edd00039c3e21d6994985
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'tests/auto/corelib/thread')
| -rw-r--r-- | tests/auto/corelib/thread/qfuture/tst_qfuture.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index e6f6827f3f..23ff646fb7 100644 --- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -136,7 +136,10 @@ private slots: void onFailedForMoveOnlyTypes(); #endif void onCanceled(); +#if 0 + // TODO: enable when QFuture::takeResults() is enabled void takeResults(); +#endif void takeResult(); void runAndTake(); void resultsReadyAt_data(); @@ -2829,6 +2832,7 @@ void tst_QFuture::testTakeResults(QFuture<T> future, size_type resultCount) testFutureTaken(copy); } +#if 0 void tst_QFuture::takeResults() { // Test takeResults() for movable types (whether or not copyable). @@ -2857,6 +2861,7 @@ void tst_QFuture::takeResults() testTakeResults(copyIface.future(), size_type(expectedCount)); } +#endif void tst_QFuture::takeResult() { @@ -2903,7 +2908,10 @@ void tst_QFuture::runAndTake() QSKIP("Failed to run the task, nothing to test"); gotcha = watcha.future(); +#if 0 + // TODO: enable when QFuture::takeResults() is enabled testTakeResults(gotcha, size_type(1)); +#endif } void tst_QFuture::resultsReadyAt_data() |