diff options
Diffstat (limited to 'src/corelib/thread/qfutureinterface.h')
-rw-r--r-- | src/corelib/thread/qfutureinterface.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h index 7b12f51e3e..3dd236752c 100644 --- a/src/corelib/thread/qfutureinterface.h +++ b/src/corelib/thread/qfutureinterface.h @@ -41,13 +41,12 @@ #define QFUTUREINTERFACE_H #include <QtCore/qrunnable.h> - -#ifndef QT_NO_QFUTURE - #include <QtCore/qmutex.h> #include <QtCore/qexception.h> #include <QtCore/qresultstore.h> +QT_REQUIRE_CONFIG(future); + QT_BEGIN_NAMESPACE @@ -291,10 +290,9 @@ public: void reportResult(const void *, int) { } void reportResults(const QVector<void> &, int) { } - void reportFinished(const void * = Q_NULLPTR) { QFutureInterfaceBase::reportFinished(); } + void reportFinished(const void * = nullptr) { QFutureInterfaceBase::reportFinished(); } }; QT_END_NAMESPACE -#endif // QT_NO_QFUTURE #endif // QFUTUREINTERFACE_H |