qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Samuli Piippo 2018-07-04 08:44:43 +03:00
parent a5dff7302c
commit 0f3c382705
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/quick/configure.json
View File

@ -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"
]