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/qfutureinterface.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/qfutureinterface.h')
| -rw-r--r-- | src/corelib/thread/qfutureinterface.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h index 047d2eb2d34..6c7c511cc07 100644 --- a/src/corelib/thread/qfutureinterface.h +++ b/src/corelib/thread/qfutureinterface.h @@ -252,7 +252,10 @@ public: inline QList<T> results(); T takeResult(); +#if 0 + // TODO: Enable and make it return a QList, when QList is fixed to support move-only types std::vector<T> takeResults(); +#endif }; template <typename T> @@ -384,6 +387,7 @@ T QFutureInterface<T>::takeResult() return ret; } +#if 0 template<typename T> std::vector<T> QFutureInterface<T>::takeResults() { @@ -404,6 +408,7 @@ std::vector<T> QFutureInterface<T>::takeResults() return res; } +#endif template <> class QFutureInterface<void> : public QFutureInterfaceBase |