diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-23 12:05:48 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-12-19 09:17:06 +0000 |
| commit | 152033bec09c8a57b46a01488cff1a88ca61da33 (patch) | |
| tree | 3c3c7695fc362d9bec0226006257aec7afc09164 /src/corelib/thread/qfuturewatcher.h | |
| parent | f76e3712f1553e02259835923274de2d11b76315 (diff) | |
Make QT_NO_FUTURE a feature
... and make sure we can compile without it. In particular,
Qt Concurrent depends on QFuture, so we specify it as a condition,
and QtConcurrentException should not depend on future but on
concurrent.
Change-Id: I65b158021cecb19f227554cc8b5df7a139fbfe78
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/thread/qfuturewatcher.h')
| -rw-r--r-- | src/corelib/thread/qfuturewatcher.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/thread/qfuturewatcher.h b/src/corelib/thread/qfuturewatcher.h index 5143db8d2e5..1d984a32054 100644 --- a/src/corelib/thread/qfuturewatcher.h +++ b/src/corelib/thread/qfuturewatcher.h @@ -41,11 +41,10 @@ #define QFUTUREWATCHER_H #include <QtCore/qfuture.h> - -#ifndef QT_NO_QFUTURE - #include <QtCore/qobject.h> +QT_REQUIRE_CONFIG(future); + QT_BEGIN_NAMESPACE @@ -212,6 +211,5 @@ Q_INLINE_TEMPLATE void QFutureWatcher<void>::setFuture(const QFuture<void> &_fut } QT_END_NAMESPACE -#endif // QT_NO_QFUTURE #endif // QFUTUREWATCHER_H |