summaryrefslogtreecommitdiffstats
path: root/src/core/configure.json
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-17 15:31:36 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-02-28 14:24:41 +0100
commitc3ab932f8b2f3a52383ce0db3ff67c925b138bde (patch)
tree48a9899f1ac5a4f29b6814c2e6c6717300cad137 /src/core/configure.json
parent26b4267a3b00ebedb560169d09f974cd87a6a370 (diff)
Adaptations for Chromium 79
Fixes: QTBUG-80737 Fixes: QTBUG-81556 Fixes: QTBUG-81614 Change-Id: Ie6a69cdbf46d0508bff226f1b8fed28a618e1949 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/configure.json')
-rw-r--r--src/core/configure.json12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/core/configure.json b/src/core/configure.json
index 9f05409ba..55e68ab04 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -26,7 +26,6 @@
"webengine-extensions": "boolean",
"webengine-webrtc": "boolean",
"webengine-geolocation": "boolean",
- "webengine-v8-snapshot": "boolean",
"webengine-webchannel": "boolean",
"webengine-kerberos": "boolean",
"alsa": { "type": "boolean", "name": "webengine-alsa" },
@@ -113,14 +112,8 @@
"condition": "config.unix && libs.webengine-alsa",
"output": [ "privateFeature" ]
},
- "webengine-v8-snapshot": {
- "label" : "Use v8 snapshot",
- "purpose": "Enables the v8 snapshot, for fast v8 context creation",
- "output": [ "privateFeature" ]
- },
"webengine-v8-snapshot-support": {
"label" : "Building v8 snapshot supported",
- "autoDetect": "features.webengine-v8-snapshot",
"condition": "!config.unix || !features.cross_compile || arch.arm64 || tests.webengine-host-compiler",
"output": [ "privateFeature" ]
},
@@ -257,7 +250,7 @@
},
{
"type": "warning",
- "condition": "config.linux && features.webengine-v8-snapshot && !features.webengine-v8-snapshot-support",
+ "condition": "config.unix && config.cross_compile && !features.webengine-v8-snapshot-support",
"message": "V8 snapshot cannot be built. Most likely, the 32-bit host compiler does not work. Please make sure you have 32-bit devel environment installed."
}
],
@@ -277,7 +270,6 @@
"webengine-webrtc",
"webengine-geolocation",
"webengine-webchannel",
- "webengine-v8-snapshot",
"webengine-kerberos",
"webengine-extensions",
{
@@ -288,7 +280,7 @@
{
"type": "feature",
"args": "webengine-v8-snapshot-support",
- "condition": "config.unix && config.cross_compile && features.webengine-v8-snapshot"
+ "condition": "config.unix && config.cross_compile"
},
{
"type": "feature",