diff options
Diffstat (limited to 'src/corelib/thread/qfuture_impl.h')
-rw-r--r-- | src/corelib/thread/qfuture_impl.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/corelib/thread/qfuture_impl.h b/src/corelib/thread/qfuture_impl.h index 2924408333..22f51d755b 100644 --- a/src/corelib/thread/qfuture_impl.h +++ b/src/corelib/thread/qfuture_impl.h @@ -279,17 +279,6 @@ template<class Class, class Callable> using EnableIfInvocable = std::enable_if_t< QtPrivate::ArgResolver<Callable>::template CanInvokeWithArgs<Class, Callable>>; -template<class> -struct isTuple : std::false_type -{ -}; -template<class... T> -struct isTuple<std::tuple<T...>> : std::true_type -{ -}; -template<class T> -inline constexpr bool isTupleV = isTuple<T>::value; - template<class T> inline constexpr bool isQFutureV = false; @@ -902,7 +891,7 @@ static QFuture<ArgsType<Signal>> connect(Sender *sender, Signal signal) QObject::disconnect(connections->second); promise.reportFinished(); }); - } else if constexpr (QtPrivate::isTupleV<ArgsType>) { + } else if constexpr (QtPrivate::ArgResolver<Signal>::HasExtraArgs) { connections->first = QObject::connect(sender, signal, sender, [promise, connections](auto... values) mutable { QObject::disconnect(connections->first); |