From 152033bec09c8a57b46a01488cff1a88ca61da33 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
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 <martin.smith@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/concurrent/qtconcurrentexception.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/concurrent')

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
-- 
cgit v1.2.3