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/qexception.cpp | |
| 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/qexception.cpp')
| -rw-r--r-- | src/corelib/thread/qexception.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp index aed8d91a0a..a3e30d5a7a 100644 --- a/src/corelib/thread/qexception.cpp +++ b/src/corelib/thread/qexception.cpp @@ -40,7 +40,6 @@ #include "qexception.h" #include "QtCore/qshareddata.h" -#if !defined(QT_NO_QFUTURE) || defined(Q_CLANG_QDOC) #if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC) QT_BEGIN_NAMESPACE @@ -225,4 +224,3 @@ bool ExceptionStore::hasThrown() const { return exceptionHolder.base->hasThrown; QT_END_NAMESPACE #endif // QT_NO_EXCEPTIONS -#endif // QT_NO_QFUTURE |