From 0c4703e923280081280f366be3daec0ccdc8dc8f Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Mon, 12 Sep 2022 19:54:20 +0200 Subject: FutureUtils: Use QtFuture::makeReadyFuture on Qt >= 6.1 --- src/base/QXmppFutureUtils_p.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/base/QXmppFutureUtils_p.h b/src/base/QXmppFutureUtils_p.h index 2551be67..bc81fb19 100644 --- a/src/base/QXmppFutureUtils_p.h +++ b/src/base/QXmppFutureUtils_p.h @@ -51,6 +51,9 @@ struct first_argument template using first_argument_t = typename first_argument::type; +#if QT_VERSION >= QT_VERSION_CHECK(6, 1, 0) +using QtFuture::makeReadyFuture; +#else template QFuture makeReadyFuture(T &&value) { @@ -59,6 +62,7 @@ QFuture makeReadyFuture(T &&value) interface.reportFinished(); return interface.future(); } +#endif inline QFuture makeReadyFuture() { -- cgit v1.2.3