Merge remote-tracking branch 'origin/5.15' into dev

Including update to 87-based

Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6

1 files changed, 34 insertions, 33 deletions

diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index 24ffa71aa..5819fb860 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -68,6 +68,12 @@
                 { "type": "pkgConfig", "args": "x11" }
             ]
         },
+        "webengine-xproto-gl": {
+            "label": "xproto (glproto)",
+            "sources": [
+                { "type": "pkgConfig", "args": "glproto" }
+            ]
+        },
         "webengine-glib": {
             "label": "glib-2.0 >= 2.32.0",
             "sources": [
@@ -102,12 +108,6 @@
                 "-ljpeg"
             ]
         },
-        "webengine-jsoncpp": {
-            "label": "jsoncpp",
-            "sources": [
-                { "type": "pkgConfig", "args": "jsoncpp" }
-            ]
-        },
         "webengine-libevent": {
             "label": "libevent",
             "sources": [
@@ -126,12 +126,6 @@
                 { "type": "pkgConfig", "args": "libpng >= 1.6.0" }
             ]
         },
-        "webengine-protobuf": {
-            "label": "protobuf",
-            "sources": [
-                { "type": "pkgConfig", "args": "protobuf" }
-            ]
-        },
         "webengine-zlib": {
             "label": "zlib",
             "sources": [
@@ -155,9 +149,9 @@
             ]
         },
         "webengine-icu": {
-            "label": "icu >= 64",
+            "label": "icu >= 65",
             "sources": [
-                { "type": "pkgConfig", "args": "icu-uc >= 64 icu-i18n >= 64" }
+                { "type": "pkgConfig", "args": "icu-uc >= 65 icu-i18n >= 65" }
             ]
         },
         "webengine-webp": {
@@ -238,10 +232,11 @@
                     "vpx_codec_cx_pkt pkt;",
                     "pkt.data.frame.width[0] = 0u;",
                     "pkt.data.frame.height[0] = 0u;",
-                    "auto a = CONSTRAINED_FROM_ABOVE_DROP;"
+                    "auto a = CONSTRAINED_FROM_ABOVE_DROP;",
+                    "auto b = VPX_IMG_FMT_NV12;"
                 ]
             },
-            "headers": [ "vpx/vpx_encoder.h", "vpx/vp8cx.h" ],
+            "headers": [ "vpx/vpx_encoder.h", "vpx/vp8cx.h", "vpx/vpx_image.h" ],
             "sources": [
                 { "type": "pkgConfig", "args": "vpx" },
                 "-lvpx"
@@ -321,10 +316,6 @@
             "type": "detectJumboBuild",
             "log": "merge_limit"
         },
-        "webengine-protoc": {
-            "label": "protoc",
-            "type": "detectProtoc"
-        },
         "webengine-win-compiler64": {
             "label": "64bit compiler",
             "type": "isWindowsHostCompiler64"
@@ -358,6 +349,11 @@
             "label": "linker supports -z noexecstack",
             "type": "linkerSupportsFlag",
             "flag": "-z,noexecstack"
+        },
+        "webengine-nodejs": {
+            "label": "node.js",
+            "type": "detectNodeJS",
+            "log": "version10"
         }
     },
     "features": {
@@ -374,6 +370,7 @@
                          && features.webengine-bison
                          && features.webengine-flex
                          && features.webengine-python2
+                         && features.webengine-nodejs
                          && (!config.sanitizer || features.webengine-sanitizer)
                          && (!config.linux || features.pkg-config)
                          && (!config.linux || features.webengine-host-pkg-config)
@@ -444,6 +441,16 @@
             "condition": "tests.webengine-flex",
             "output": [ "privateFeature" ]
         },
+        "webengine-nodejs": {
+            "label": "node.js",
+            "condition": "tests.webengine-nodejs",
+            "output": [ "privateFeature" ]
+        },
+        "webengine-nodejs10": {
+            "label": "node.js",
+            "condition": "tests.webengine-nodejs && tests.webengine-nodejs.version10",
+            "output": [ "privateFeature" ]
+        },
         "webengine-system-ninja": {
             "label": "Use System Ninja",
             "condition": "tests.webengine-ninja",
@@ -513,6 +520,11 @@
             "condition": "config.unix && libs.webengine-x11",
             "output": [ "privateFeature" ]
         },
+        "webengine-system-xproto-gl" : {
+            "label": "xproto (glproto)",
+            "condition": "config.unix && libs.webengine-xproto-gl",
+            "output": [ "privateFeature" ]
+        },
         "webengine-host-pkg-config": {
             "label": "host-pkg-config",
             "condition": "config.unix && tests.webengine-host-pkg-config",
@@ -529,6 +541,7 @@
                           && features.webengine-system-xcomposite
                           && features.webengine-system-xcursor
                           && features.webengine-system-xi
+                          && features.webengine-system-xproto-gl
                           && features.webengine-system-xtst",
              "output": [ "privateFeature" ]
         },
@@ -575,16 +588,6 @@
             "condition": "config.unix && libs.webengine-libevent",
             "output": [ "privateFeature" ]
         },
-        "webengine-system-jsoncpp" : {
-            "label": "jsoncpp",
-            "condition": "config.unix && libs.webengine-jsoncpp",
-            "output": [ "privateFeature" ]
-        },
-        "webengine-system-protobuf" : {
-            "label": "protobuf",
-            "condition": "config.unix && libs.webengine-protobuf && tests.webengine-protoc",
-            "output": [ "privateFeature" ]
-        },
         "webengine-system-png" : {
             "label": "png",
             "condition": "config.unix && features.system-png && libs.webengine-png",
@@ -754,7 +757,6 @@
             "section": "Qt WebEngine Build Tools",
             "entries": [
                 "webengine-system-ninja",
-                "webengine-system-gn",
                 {
                     "message": "Jumbo Build Merge Limit",
                     "type": "jumboBuild"
@@ -785,6 +787,7 @@
                         "webengine-system-xcomposite",
                         "webengine-system-xcursor",
                         "webengine-system-xi",
+                        "webengine-system-xproto-gl",
                         "webengine-system-xtst"
                      ]
                 },
@@ -803,8 +806,6 @@
                         "webengine-system-zlib",
                         "webengine-system-minizip",
                         "webengine-system-libevent",
-                        "webengine-system-jsoncpp",
-                        "webengine-system-protobuf",
                         "webengine-system-libxml2",
                         "webengine-system-lcms2",
                         "webengine-system-png",