From 3d040267f436e4f28819e1b5f362a1a908dceea5 Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Fri, 9 Oct 2020 14:34:08 +0200
Subject: 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>
---
 src/corelib/thread/qfuture.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/corelib/thread/qfuture.h')

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(); }
 
-- 
cgit v1.2.3