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 /src/corelib/thread/qfuture.h | |
| 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 'src/corelib/thread/qfuture.h')
| -rw-r--r-- | src/corelib/thread/qfuture.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/thread/qfuture.h b/src/corelib/thread/qfuture.h index 3201f46710..70cc206f13 100644 --- a/src/corelib/thread/qfuture.h +++ b/src/corelib/thread/qfuture.h @@ -163,8 +163,11 @@ QT_WARNING_POP template<typename U = T, typename = QtPrivate::EnableForNonVoid<U>> T takeResult() { return d.takeResult(); } +#if 0 + // TODO: Enable and make it return a QList, when QList is fixed to support move-only types template<typename U = T, typename = QtPrivate::EnableForNonVoid<U>> std::vector<T> takeResults() { return d.takeResults(); } +#endif bool isValid() const { return d.isValid(); } |