From 152033bec09c8a57b46a01488cff1a88ca61da33 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 23 Nov 2016 12:05:48 +0100 Subject: 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 Reviewed-by: Oswald Buddenhagen --- src/corelib/thread/qexception.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/corelib/thread/qexception.cpp') 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 -- cgit v1.2.3