Adaptations for Chromium 80

Change-Id: Icaf68648cbc2c13a61fc3b208ff1e64ca36c90b6
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

4 files changed, 34 insertions, 60 deletions

diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
index f2b4a854e..9824897f0 100644
--- a/src/buildtools/config/common.pri
+++ b/src/buildtools/config/common.pri
@@ -16,6 +16,7 @@ gn_args += \
     enable_reporting=false \
     enable_resource_whitelist_generation=false \
     enable_swiftshader=false \
+    angle_enable_swiftshader=false \
     enable_web_auth=false \
     enable_web_speech=false \
     enable_widevine=true \
diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
index 2aa345c21..c02af3909 100644
--- a/src/buildtools/config/linux.pri
+++ b/src/buildtools/config/linux.pri
@@ -192,6 +192,11 @@ host_build {
     } else {
         gn_args += use_alsa=false
     }
+    qtConfig(build-qtwebengine-core):qtConfig(webengine-system-xkbcommon) {
+        gn_args += use_xkbcommon=true
+    } else {
+        gn_args += use_xkbcommon=false
+    }
     !packagesExist(libpci): gn_args += use_libpci=false
 
     qtConfig(build-qtwebengine-core):qtConfig(webengine-ozone-x11) {
diff --git a/src/buildtools/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri
index a7ed61214..01aca4ca7 100644
--- a/src/buildtools/config/mac_osx.pri
+++ b/src/buildtools/config/mac_osx.pri
@@ -29,7 +29,8 @@ gn_args += \
     clang_use_chrome_plugins=false \
     mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
     mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \
-    use_external_popup_menu=false
+    use_external_popup_menu=false \
+    angle_enable_vulkan=false
 
 qtConfig(build-qtwebengine-core):qtConfig(webengine-spellchecker) {
     qtConfig(webengine-native-spellchecker): gn_args += use_browser_spellchecker=true
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index c2531a744..1298ab916 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -32,6 +32,12 @@
                 { "type": "pkgConfig", "args": "libdrm" }
             ]
         },
+        "webengine-xkbcommon": {
+            "label": "xkbcommon",
+            "sources": [
+                { "type": "pkgConfig", "args": "xkbcommon" }
+            ]
+        },
         "webengine-xcomposite": {
             "label": "xcomposite",
             "sources": [
@@ -143,10 +149,13 @@
             "test" : {
                 "main": [
                     "std::string s;",
-                    "RE2 re2(s);"
+                    "re2::FilteredRE2 fre2(1);",
+                    "int id = 0;",
+                    "fre2.Add(s, {}, &id);",
+                    "const RE2 &re2 = fre2.GetRE2(id);"
                 ]
             },
-            "headers": "re2/re2.h",
+            "headers": "re2/filtered_re2.h",
             "sources": [
                 { "type": "pkgConfig", "args": "re2" }
             ]
@@ -203,36 +212,6 @@
                 { "type": "pkgConfig", "args": "libxml-2.0 libxslt" }
             ]
         },
-        "webengine-libdrm": {
-            "label": "libdrm",
-            "sources": [
-                { "type": "pkgConfig", "args": "libdrm" }
-            ]
-        },
-        "webengine-xcomposite": {
-            "label": "xcomposite",
-            "sources": [
-                { "type": "pkgConfig", "args": "xcomposite" }
-            ]
-        },
-        "webengine-xcursor": {
-            "label": "xcursor",
-            "sources": [
-                { "type": "pkgConfig", "args": "xcursor" }
-            ]
-        },
-        "webengine-xi": {
-            "label": "xi",
-            "sources": [
-                { "type": "pkgConfig", "args": "xi" }
-            ]
-        },
-        "webengine-xtst": {
-            "label": "xtst",
-            "sources": [
-                { "type": "pkgConfig", "args": "xtst" }
-            ]
-        },
         "webengine-ffmpeg": {
             "label": "libavcodec libavformat libavutil",
             "sources": [
@@ -242,7 +221,7 @@
         "webengine-opus": {
             "label": "opus",
             "sources": [
-                { "type": "pkgConfig", "args": "opus" }
+                { "type": "pkgConfig", "args": "opus >= 1.3.1" }
             ]
         },
         "webengine-snappy": {
@@ -317,6 +296,13 @@
                 ]
             }
         },
+        "webengine-xkbcommon": {
+            "label": "system xkbcommon",
+            "type": "compile",
+            "test": {
+                "include": "xkbcommon/xkbcommon.h"
+            }
+        },
         "webengine-ninja": {
             "label": "system ninja",
             "type": "detectNinja"
@@ -467,6 +453,11 @@
             "condition": "libs.webengine-libdrm",
             "output": [ "privateFeature" ]
         },
+        "webengine-system-xkbcommon": {
+            "label": "xkbcommon",
+            "condition": "libs.webengine-xkbcommon && tests.webengine-xkbcommon",
+            "output": [ "privateFeature" ]
+        },
         "webengine-system-xcomposite": {
             "label": "xcomposite",
             "condition": "libs.webengine-xcomposite",
@@ -541,31 +532,6 @@
                 { "type": "varAssign", "name": "QMAKE_JUMBO_MERGE_LIMIT", "value": "tests.webengine-jumbo-build.merge_limit" }
             ]
         },
-        "webengine-system-libdrm": {
-            "label": "libdrm",
-            "condition": "libs.webengine-libdrm",
-            "output": [ "privateFeature" ]
-        },
-        "webengine-system-xcomposite": {
-            "label": "xcomposite",
-            "condition": "libs.webengine-xcomposite",
-            "output": [ "privateFeature" ]
-        },
-        "webengine-system-xcursor": {
-            "label": "xcursor",
-            "condition": "libs.webengine-xcursor",
-            "output": [ "privateFeature" ]
-        },
-        "webengine-system-xi": {
-            "label": "xi",
-            "condition": "libs.webengine-xi",
-            "output": [ "privateFeature" ]
-        },
-        "webengine-system-xtst": {
-            "label": "xtst",
-            "condition": "libs.webengine-xtst",
-            "output": [ "privateFeature" ]
-        },
         "webengine-system-harfbuzz": {
             "label": "harfbuzz",
             "condition": "config.unix && features.system-harfbuzz && libs.webengine-harfbuzz",
@@ -786,7 +752,8 @@
                         "webengine-system-png",
                         "webengine-system-jpeg",
                         "webengine-system-harfbuzz",
-                        "webengine-system-freetype"
+                        "webengine-system-freetype",
+                        "webengine-system-xkbcommon"
                      ]
                  }
              ]