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>
---
 configure.json | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index a0b9765d18..6a37695d02 100644
--- a/configure.json
+++ b/configure.json
@@ -1055,10 +1055,17 @@
             "condition": "libs.zlib",
             "output": [ "privateFeature" ]
         },
+        "future": {
+            "label": "QFuture",
+            "purpose": "Provides QFuture and related classes.",
+            "section": "Kernel",
+            "output": [ "publicFeature" ]
+        },
         "concurrent": {
             "label": "Qt Concurrent",
             "purpose": "Provides a high-level multi-threading API.",
             "section": "Kernel",
+            "condition": "features.future",
             "output": [ "publicFeature", "feature" ]
         },
         "dbus": {
-- 
cgit v1.2.3