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/concurrent | |
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/concurrent')
-rw-r--r-- | src/concurrent/qtconcurrentexception.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/concurrent/qtconcurrentexception.h b/src/concurrent/qtconcurrentexception.h index 3ed4ac2cf5..9da53fd9e2 100644 --- a/src/concurrent/qtconcurrentexception.h +++ b/src/concurrent/qtconcurrentexception.h @@ -41,11 +41,10 @@ #define QTCONCURRENT_EXCEPTION_H #include <QtConcurrent/qtconcurrent_global.h> - -#if !defined(QT_NO_QFUTURE) || defined(Q_CLANG_QDOC) - #include <QtCore/qexception.h> +QT_REQUIRE_CONFIG(concurrent); + QT_BEGIN_NAMESPACE @@ -63,6 +62,4 @@ typedef Q_DECL_DEPRECATED QUnhandledException UnhandledException; QT_END_NAMESPACE -#endif // QT_NO_QFUTURE - #endif |