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/corelib/thread/qfuturewatcher_p.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/corelib/thread/qfuturewatcher_p.h')

diff --git a/src/corelib/thread/qfuturewatcher_p.h b/src/corelib/thread/qfuturewatcher_p.h
index 25d1ef8d25..ead247b040 100644
--- a/src/corelib/thread/qfuturewatcher_p.h
+++ b/src/corelib/thread/qfuturewatcher_p.h
@@ -54,10 +54,10 @@
 #include "qfutureinterface_p.h"
 #include <qlist.h>
 
-#ifndef QT_NO_QFUTURE
-
 #include <private/qobject_p.h>
 
+QT_REQUIRE_CONFIG(future);
+
 QT_BEGIN_NAMESPACE
 
 class QFutureWatcherBase;
@@ -84,5 +84,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_QFUTURE
 #endif
-- 
cgit v1.2.3