summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-07-04 08:44:43 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-07-31 06:12:40 +0000
commit0f3c382705b8017f929977b84b573f880fc5a707 (patch)
tree85c47301c70765f931acd3814b915de5ecd979a4
parenta5dff7302cea62f3cfe3235cf64c359b2464d126 (diff)
Fix build without GUI module
Qt Quick has a dependency to gui, but there is no way to disable an entire configure module from the configure system. Add module checks to configure.json so that it passes even without the gui module present. Fixes "Unknown feature object movie in expression 'features.movie'." Task-number: QTBUG-56656 Change-Id: I16355b7e218c32cab33e8ef9a6012da3e55656bb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/quick/configure.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/configure.json b/src/quick/configure.json
index ea1d49baad..2c57c3318f 100644
--- a/src/quick/configure.json
+++ b/src/quick/configure.json
@@ -45,7 +45,7 @@
"label": "AnimatedImage item",
"purpose": "Provides the AnimatedImage item.",
"section": "Qt Quick",
- "condition": "features.movie",
+ "condition": "module.gui && features.movie",
"output": [
"privateFeature"
]
@@ -111,7 +111,7 @@
"label": "Particle support",
"purpose": "Provides a particle system.",
"section": "Qt Quick",
- "condition": "features.quick-shadereffect && features.quick-sprite && features.opengl",
+ "condition": "module.gui && features.quick-shadereffect && features.quick-sprite && features.opengl",
"output": [
"privateFeature"
]