From 5983f75003dde37b5429b126149b3bcc6c02d4dc Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 21 Feb 2018 14:43:22 +0100
Subject: [PATCH] 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>
---
configure.json | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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" : {
@@ -616,6 +617,11 @@
"webengine-system-ninja",
"webengine-geolocation",
"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",
--
GitLab