summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2020-03-20 16:12:56 +0100
committerSona Kurazyan <sona.kurazyan@qt.io>2020-03-23 16:47:55 +0100
commit9ff75d4ea11c78ad4acaf5f51e119b5039595837 (patch)
treeef1c46dc13498a226f397efa54213a1cbd7997bc
parent1005c86c6101a9cdc5ce37de3fd5bc67505bf8bc (diff)
Make QFuture::d private
Change-Id: I5820fa1d6d0f003a7cb95db115ef90b32f380a79 Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r--src/corelib/thread/qfuture.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/thread/qfuture.h b/src/corelib/thread/qfuture.h
index dd2f5111e0..7bcae5a76f 100644
--- a/src/corelib/thread/qfuture.h
+++ b/src/corelib/thread/qfuture.h
@@ -254,10 +254,18 @@ public:
private:
friend class QFutureWatcher<T>;
-public: // Warning: the d pointer is not documented and is considered private.
- // TODO: make this private
+ template<class U>
+ friend class QFuture;
+
+ template<class Function, class ResultType, class ParentResultType>
+ friend class QtPrivate::Continuation;
+
using QFuturePrivate =
std::conditional_t<std::is_same_v<T, void>, QFutureInterfaceBase, QFutureInterface<T>>;
+
+#ifdef QFUTURE_TEST
+public:
+#endif
mutable QFuturePrivate d;
};