diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-01 01:00:11 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-01 13:19:03 +0200 |
| commit | 9d8c309e27c87ce8a5c58f7f03de535ce999ff24 (patch) | |
| tree | 37db3e8626bb34b6dac078c1762ff299af90a29a /src/quick/configure.json | |
| parent | f294fda40c19c0ecc3c99efb3aabe1b14933cc84 (diff) | |
| parent | a30138cae86268d71415bc88cfba157977f4a442 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I654a2a4b34dadc7cb7d85625b86f54691ad5904a
Diffstat (limited to 'src/quick/configure.json')
| -rw-r--r-- | src/quick/configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/configure.json b/src/quick/configure.json index ab356be557..9ec3531ef4 100644 --- a/src/quick/configure.json +++ b/src/quick/configure.json @@ -46,7 +46,7 @@ "label": "AnimatedImage item", "purpose": "Provides the AnimatedImage item.", "section": "Qt Quick", - "condition": "features.movie", + "condition": "module.gui && features.movie", "output": [ "privateFeature" ] @@ -120,7 +120,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" ] |