1 files changed, 36 insertions, 2 deletions
diff --git a/configure.json b/configure.json
index 7ef1f5003..c44da9854 100644
--- a/configure.json
+++ b/configure.json
@@ -21,8 +21,8 @@
             "webengine-spellchecker": "boolean",
             "webengine-native-spellchecker": "boolean",
             "webengine-webrtc": "boolean",
-            "webengine-geolocation" : "boolean",
-
+            "webengine-geolocation": "boolean",
+            "webengine-v8-snapshot": "boolean",
             "alsa": { "type": "boolean", "name": "webengine-alsa" },
             "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" },
             "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
@@ -189,6 +189,11 @@
             "test": "alsa",
             "type": "compile"
         },
+        "webengine-host-compiler": {
+            "label": "host compiler",
+            "test": "hostcompiler",
+            "type": "compile"
+        },
         "webengine-khr": {
             "label": "khr",
             "test": "khr",
@@ -223,6 +228,11 @@
             "type": "detectPython2",
             "log": "location"
         },
+        "webengine-host-pkg-config": {
+            "label": "host pkg-config",
+            "type": "detectHostPkgConfig",
+            "log": "path"
+        },
         "webengine-gperf": {
             "label": "gperf",
             "type": "detectGperf"
@@ -355,6 +365,14 @@
                 { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" }
             ]
         },
+        "webengine-host-pkg-config": {
+            "label": "host-pkg-config",
+            "condition": "config.unix && tests.webengine-host-pkg-config",
+            "output": [
+                "privateFeature",
+                { "type": "varAssign", "name": "QMAKE_PKG_CONFIG_HOST", "value": "tests.webengine-host-pkg-config.path" }
+            ]
+        },
         "webengine-gperf": {
             "label": "gperf",
             "condition": "tests.webengine-gperf",
@@ -383,6 +401,16 @@
             "condition": "config.unix && tests.alsa",
             "output": [ "privateFeature" ]
         },
+        "webengine-v8-snapshot": {
+            "label" : "Use v8 snapshot",
+            "purpuse": "Enables the v8 snapshot, for fast v8 context creation",
+            "output": [ "privateFeature" ]
+        },
+        "webengine-v8-snapshot-support": {
+            "autoDetect": "features.webengine-v8-snapshot",
+            "condition": "!config.unix || !features.webengine-embedded-build || tests.webengine-host-compiler",
+            "output": [ "privateFeature" ]
+        },
         "webengine-system-khr" : {
             "label": "khr",
             "condition": "config.unix && tests.webengine-khr",
@@ -566,6 +594,11 @@
             "type": "warning",
             "condition": "config.sanitizer && !tests.webengine-sanitizer && !features.webengine-sanitizer",
             "message": "Qt WebEngine cannot be built with the chosen sanitizer configuration. Check config.log for details or use -feature-webengine-sanitizer to force the build."
+        },
+        {
+            "type": "warning",
+            "condition": "config.unix && !features.webengine-host-pkg-config",
+            "message": "host pkg-config not found"
         }
     ],
 
@@ -582,6 +615,7 @@
                 "webengine-webrtc",
                 "webengine-system-ninja",
                 "webengine-geolocation",
+                "webengine-v8-snapshot",
                 {
                     "type": "feature",
                     "args": "webengine-alsa",