summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-02-21 14:43:22 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-02-21 14:25:39 +0000
commit5983f75003dde37b5429b126149b3bcc6c02d4dc (patch)
tree2bd09aee8bb621a11bb0842953faa045e96ceb39 /configure.json
parent91bf3b3f87c0275ac4e7b1805a74ce931522adda (diff)
Fix webengine-v8-snapshot-support configure
It needs to be checked for all cross builds not just embedded builds, it doesn't need to be checked for 64-bit archictures, and it is helpful to list it in the overview even if we only act on it later. Change-Id: I68c571480186bb9564cb564ca561dfd284f6e231 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.json b/configure.json
index c44da9854..1adc5992b 100644
--- a/configure.json
+++ b/configure.json
@@ -407,8 +407,9 @@
"output": [ "privateFeature" ]
},
"webengine-v8-snapshot-support": {
+ "label" : "Building v8 snapshot supported",
"autoDetect": "features.webengine-v8-snapshot",
- "condition": "!config.unix || !features.webengine-embedded-build || tests.webengine-host-compiler",
+ "condition": "!config.unix || !features.cross_compile || arch.arm64 || tests.webengine-host-compiler",
"output": [ "privateFeature" ]
},
"webengine-system-khr" : {
@@ -618,6 +619,11 @@
"webengine-v8-snapshot",
{
"type": "feature",
+ "args": "webengine-v8-snapshot-support",
+ "condition": "config.unix && config.cross_compile && features.webengine-v8-snapshot"
+ },
+ {
+ "type": "feature",
"args": "webengine-alsa",
"condition": "config.unix"
},