diff --git a/src/corelib/thread/qfuture_impl.h b/src/corelib/thread/qfuture_impl.h index b09d84a6d39..29244083336 100644 --- a/src/corelib/thread/qfuture_impl.h +++ b/src/corelib/thread/qfuture_impl.h @@ -51,6 +51,7 @@ #include #include #include +#include QT_BEGIN_NAMESPACE @@ -82,10 +83,6 @@ WhenAnyResult(qsizetype, const QFuture &) -> WhenAnyResult; namespace QtPrivate { -template -using EnableIfSameOrConvertible = std::enable_if_t - || std::is_convertible_v>; - template using EnableForVoid = std::enable_if_t>; diff --git a/src/corelib/thread/qpromise.h b/src/corelib/thread/qpromise.h index f62a2a54e31..f7abf8babc7 100644 --- a/src/corelib/thread/qpromise.h +++ b/src/corelib/thread/qpromise.h @@ -41,7 +41,7 @@ #define QPROMISE_H #include -#include +#include #include @@ -49,6 +49,13 @@ QT_REQUIRE_CONFIG(future); QT_BEGIN_NAMESPACE +namespace QtPrivate { + +template +using EnableIfSameOrConvertible = std::enable_if_t>; + +} // namespace QtPrivate + template class QPromise {