diff options
| author | Linus Jahn <lnj@kaidan.im> | 2022-09-12 19:54:20 +0200 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2022-09-12 23:05:56 +0200 |
| commit | 0c4703e923280081280f366be3daec0ccdc8dc8f (patch) | |
| tree | 0f7f63127205c9ba0906c772ec62f5279c5dc0c1 /src | |
| parent | 8f2ee5613cea91ede28e6c8ce699fd7663681983 (diff) | |
| download | qxmpp-0c4703e923280081280f366be3daec0ccdc8dc8f.tar.gz | |
FutureUtils: Use QtFuture::makeReadyFuture on Qt >= 6.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/QXmppFutureUtils_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
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<typename F> using first_argument_t = typename first_argument<F>::type; +#if QT_VERSION >= QT_VERSION_CHECK(6, 1, 0) +using QtFuture::makeReadyFuture; +#else template<typename T> QFuture<T> makeReadyFuture(T &&value) { @@ -59,6 +62,7 @@ QFuture<T> makeReadyFuture(T &&value) interface.reportFinished(); return interface.future(); } +#endif inline QFuture<void> makeReadyFuture() { |