diff options
| author | Tasuku Suzuki <tasuku.suzuki@qbc.io> | 2019-06-03 21:24:15 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@qbc.io> | 2019-07-05 16:11:28 +0900 |
| commit | be1e682572733ca5a0c3c65d049551daf8546f41 (patch) | |
| tree | c9ba02d9b176c0ba07c43dab73782aec5565357d /src/gui/configure.json | |
| parent | 7b17113e49b44ba5eec86831e3f697e98010f228 (diff) | |
Fix build without feature.xmlstreamreader
This commit introduces a new feature called vkgen for the tool which
depends on xmlstreamreader.
Note that when features.vkgen is disabled, vulkan.pri will generate
dummy qvulkanfunctions.h and qvulkanfunctions_p.h because buildsystem
needs them.
Task-number: QTBUG-76159
Change-Id: I03d526a0fd76a2d8b531940f37538cead109d9d3
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index c7bafb8925..764e92a729 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1357,9 +1357,14 @@ "condition": "features.opengl-desktop || features.opengl-dynamic || features.opengles2", "output": [ "publicFeature", "feature" ] }, + "vkgen": { + "label": "vkgen", + "condition": "features.xmlstreamreader", + "output": [ "privateFeature" ] + }, "vulkan": { "label": "Vulkan", - "condition": "libs.vulkan", + "condition": "features.vkgen && libs.vulkan", "output": [ "publicFeature" ] }, "openvg": { |