From cf043a785ac9357e8f1283ea9e1496261af2b1a5 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 2 Oct 2020 19:24:38 +0200
Subject: QtConcurrent: Integrate runWithPromise into run

Change-Id: I6eb95aa66ff847e8bb9aac348fded3a5d55015b6
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
---
 src/corelib/thread/qfuture_impl.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/corelib/thread')

diff --git a/src/corelib/thread/qfuture_impl.h b/src/corelib/thread/qfuture_impl.h
index bd3976f990..b8b9f39951 100644
--- a/src/corelib/thread/qfuture_impl.h
+++ b/src/corelib/thread/qfuture_impl.h
@@ -124,7 +124,7 @@ struct ArgsType<Arg, Args...>
 {
     using First = Arg;
     using PromiseType = void;
-    static const bool IsPromise = false;
+    using IsPromise = std::false_type;
     static const bool HasExtraArgs = (sizeof...(Args) > 0);
     using AllArgs =
             std::conditional_t<HasExtraArgs, std::tuple<std::decay_t<Arg>, std::decay_t<Args>...>,
@@ -139,7 +139,7 @@ struct ArgsType<QPromise<Arg> &, Args...>
 {
     using First = QPromise<Arg> &;
     using PromiseType = Arg;
-    static const bool IsPromise = true;
+    using IsPromise = std::true_type;
     static const bool HasExtraArgs = (sizeof...(Args) > 0);
     using AllArgs =
             std::conditional_t<HasExtraArgs, std::tuple<std::decay_t<QPromise<Arg> &>, std::decay_t<Args>...>,
@@ -154,7 +154,7 @@ struct ArgsType<>
 {
     using First = void;
     using PromiseType = void;
-    static const bool IsPromise = false;
+    using IsPromise = std::false_type;
     static const bool HasExtraArgs = false;
     using AllArgs = void;
 
-- 
cgit v1.2.3