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 /configure.json | |
| 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 'configure.json')
| -rw-r--r-- | configure.json | 7 |
1 files changed, 7 insertions, 0 deletions
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": { |