Update to Qt 5.15.2

Signed-off-by: Jani Suonpera <jani.suonpera@qt.io> Change-Id: I5992e74cf524f9378dab64503345111b1cc159f2
2026-06-21 08:52:35 +02:00 · 2020-12-10 09:03:39 +02:00
parent 37b9544575
commit 252ec0f59e
73 changed files with 1181 additions and 1386 deletions
--- a/licenses/The-Qt-Company-Commercial
+++ b/licenses/The-Qt-Company-Commercial
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -36,12 +36,10 @@ SRC_URI += "\
    file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
    file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
    file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
-    file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
    file://0013-Disable-ltcg-for-host_build.patch \
    file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
    file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
    file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
    file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
    file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
 "
@@ -197,4 +195,4 @@ fakeroot do_generate_qt_environment_file() {
 do_generate_qt_environment_file[umask] = "022"
 addtask generate_qt_environment_file after do_install before do_package

-SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9"
+SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
--- a/recipes-qt/qt5/ogl-runtime_git.bb
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtdeclarative qtquickcontrols2"

-QT_MODULE_BRANCH = "2.7"
+QT_MODULE_BRANCH = "master"
 QT_MODULE_BRANCH_EASTL = "master"
 QT_GIT_PROJECT = "qt3dstudio"
-PV = "2.7.0+git${SRCPV}"
+PV = "2.8.0+git${SRCPV}"

 COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc64).*-linux"

@@ -22,7 +22,7 @@ SRC_URI += " \
    file://0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch \
 "

-SRCREV_ogl-runtime = "b9b52349d0df29e2eaa30dd13644b9f42d9e4f3e"
+SRCREV_ogl-runtime = "b53aeb784f950d7b2a5ebe38ea37c5bb6f456c9c"
 SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5"
 SRCREV = "${SRCREV_ogl-runtime}"

--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -28,6 +28,7 @@ index c5232e116..cf5345352 100644
 +    sub_tools.depends -= sub_src
 +    SUBDIRS = sub_tools
 +}
+\ No newline at end of file
 diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
 index 8ba2d9a41..e973d93dd 100644
 --- a/src/3rdparty/assimp/assimp_dependency.pri
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
         ${S}/src/quick3d/imports/input/importsinput.pro
 }

-SRCREV = "d1e6bd43de4883c7e40ca0efc10ff4735ba766c5"
+SRCREV = "34171b1d99f55fde1627df3c57eed50480ab2ae7"

 BBCLASSEXTEND += "native nativesdk"
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
 # Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com>

 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.15"
+QT_MODULE_BRANCH ?= "5.15.2"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"

 # each module needs to define valid SRCREV
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"

 S = "${WORKDIR}/git"

-PV = "5.15.0+git${SRCPV}"
+PV = "5.15.2+git${SRCPV}"
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -31,12 +31,10 @@ SRC_URI += "\
    file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
    file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
    file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
-    file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
    file://0013-Disable-ltcg-for-host_build.patch \
    file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
    file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
    file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
    file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
    file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
 "
@@ -144,4 +142,4 @@ do_install() {
    echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
 }

-SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9"
+SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
-From 8442f94819458c79a88ad6177207c0e922a007bd Mon Sep 17 00:00:00 2001
+From c97da220d95091386724e1eadc360ed16ed52dfe Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
 Subject: [PATCH] Add linux-oe-g++ platform
@@ -65,10 +65,10 @@ index 934a18a924..0f5b1b6333 100644
             msg = "test $$1 succeeded"
             write_file($$QMAKE_CONFIG_LOG, msg, append)
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 99b7fe6562..1ddfddb2bd 100644
+index 69d1954306..37f7c9c4a2 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) {
+@@ -151,7 +151,7 @@ import_plugins:qtConfig(static) {
             plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
             plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
             isEmpty(plug_path): \
@@ -77,7 +77,7 @@ index 99b7fe6562..1ddfddb2bd 100644
             LIBS += $$plug_path/$$plug_type/$$plug_name
         } else {
             LIBS += -l$${plug}$$qtPlatformTargetSuffix()
-@@ -271,8 +271,8 @@ for(ever) {
+@@ -274,8 +274,8 @@ for(ever) {
 # static builds: link qml import plugins into the target.
 contains(all_qt_module_deps, qml): \
         qtConfig(static):import_plugins:!host_build:!no_import_scan {
--- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,4 +1,4 @@
-From 56eb22b1063d9bbdcf6ec39828e4c3498b72c99c Mon Sep 17 00:00:00 2001
+From 44e37eab48ff04bd20815fd4ae0b5d79d493aabc Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <denys@ti.com>
 Date: Tue, 25 Aug 2015 10:05:15 -0400
 Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/configure.pri b/configure.pri
-index e775bf046e..a20eded987 100644
+index 49755f7abf..f84862d1ca 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -876,10 +876,10 @@ defineTest(qtConfOutput_preparePaths) {
+@@ -883,10 +883,10 @@ defineTest(qtConfOutput_preparePaths) {
 
     $${currentConfig}.output.qconfigSource = \
         "/* Installation Info */" \
--- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
+++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
@@ -1,4 +1,4 @@
-From c4393e037ebfc6bfa1a58ceab29fdb78389cd47e Mon Sep 17 00:00:00 2001
+From 18904a169397f343e75bee5f29fa9ae1444a295f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 27 Jul 2017 08:02:51 -0700
 Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -36,7 +36,7 @@ index 19b3289390..4d0cdf8b5f 100644
             QMetaType info(tp);
             if (!info.isValid()) {
 diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
-index 6dd390ccbd..43b92606d9 100644
+index e397e80fe0..cdb7893e56 100644
 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -78,6 +78,7 @@
@@ -46,8 +46,8 @@ index 6dd390ccbd..43b92606d9 100644
 +#include <sched.h>
 #endif
 
- #include "private/qhostinfo_p.h"
-@@ -2199,8 +2200,8 @@ public slots:
+ #include <memory>
+@@ -2200,8 +2201,8 @@ public slots:
 
 #if defined(Q_OS_MAC)
         pthread_yield_np();
--- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
+++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
@@ -1,49 +0,0 @@
-From 47d2068fa96173b68bcbc45a80a66d7c9cbf4775 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 14 Feb 2018 17:08:43 -0800
-Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem
-
-isystem fails to build when code uses include_next on certain files e.g.
-
-qtbase/5.10.0+gitAUTOINC+50117d738a-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory
- #include_next <stdlib.h>
-               ^~~~~~~~~~
-compilation terminated.
-make[2]: *** [Makefile:11592: .obj/qgenericpluginfactory.o] Error 1
-
-Upstream-Status: Pending
-
-Change-Id: Ia47832a6339a6ee59c0a6301fc5e552cd28b1029
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- mkspecs/common/clang.conf    | 2 +-
- mkspecs/common/gcc-base.conf | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
-index 2499c8b6d8..2e79e083cd 100644
--- a/mkspecs/common/clang.conf
-+++ b/mkspecs/common/clang.conf
-@@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT    = .pch
- 
- QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
- 
-QMAKE_CFLAGS_ISYSTEM             = -isystem
-+QMAKE_CFLAGS_ISYSTEM             =
- QMAKE_CFLAGS_PRECOMPILE          = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
- QMAKE_CFLAGS_USE_PRECOMPILE      = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
- QMAKE_CFLAGS_LTCG                = -flto=thin
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..adf3fead32 100644
--- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG         += -g
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-QMAKE_CFLAGS_ISYSTEM        = -isystem
-+QMAKE_CFLAGS_ISYSTEM        =
- QMAKE_CFLAGS_YACC          += -Wno-unused -Wno-parentheses
- QMAKE_CFLAGS_HIDESYMS      += -fvisibility=hidden
- QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
--- a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
+++ b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
@@ -1,70 +0,0 @@
-From 8e9c933cad3bd044b432b5557cf47a9ffea4e318 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Nov 2019 08:27:39 -0800
-Subject: [PATCH] input: Make use of timeval portable for 64bit time_t
-
-This patch avoids using time field of input_event structure which is not available
-on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new
-and keeps old input.h implementation functional as well.
-
-See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
-Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610]
-Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845
---
- .../input/evdevkeyboard/qevdevkeyboardhandler.cpp      | 10 +++++++++-
- .../input/evdevtouch/qevdevtouchhandler.cpp            |  7 ++++++-
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
-index 3555763b89..e7dc57c027 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
-+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
-@@ -58,6 +58,11 @@
- #include <linux/input.h>
- #endif
- 
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- QT_BEGIN_NAMESPACE
- 
- Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input")
-@@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state)
-     qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state));
- 
-     struct ::input_event led_ie;
-    ::gettimeofday(&led_ie.time, 0);
-+    struct timeval tval;
-+    ::gettimeofday(&tval, 0);
-+    led_ie.input_event_sec = tval.tv_sec;
-+    led_ie.input_event_usec = tval.tv_usec;
-     led_ie.type = EV_LED;
-     led_ie.code = led;
-     led_ie.value = state;
-diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-index 78728ef4ce..1d65f9b9f7 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-@@ -58,6 +58,11 @@
- #include <linux/input.h>
- #endif
- 
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- #include <math.h>
- 
- #if QT_CONFIG(mtdev)
-@@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
- 
-         // update timestamps
-         m_lastTimeStamp = m_timeStamp;
-        m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0;
-+        m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0;
- 
-         m_lastTouchPoints = m_touchPoints;
-         m_touchPoints.clear();
--- a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
+++ b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
@@ -1,4 +1,4 @@
-From 557aa4d5584525cca4efcf20d6a86ad3ae99e36b Mon Sep 17 00:00:00 2001
+From 6c9e68cffb15cc1e848ca57ea12d4e5905d46507 Mon Sep 17 00:00:00 2001
 From: Nicola Lunghi <nick83ola@gmail.com>
 Date: Wed, 5 Feb 2020 15:32:25 +0000
 Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform
@@ -13,10 +13,10 @@ Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/2894
 1 file changed, 37 insertions(+), 13 deletions(-)

 diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
-index 45798cc527..de3f156cae 100644
+index 42e98ce363..0ca9b87f04 100644
 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
 +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
-@@ -2894,19 +2894,43 @@ void tst_QPainter::monoImages()
+@@ -2931,19 +2931,43 @@ void tst_QPainter::monoImages()
 #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__)
 #include <fenv.h>
 
@@ -67,7 +67,7 @@ index 45798cc527..de3f156cae 100644
         return QLatin1String("Invalid operation");
     return QLatin1String("No exception");
 }
-@@ -2932,7 +2956,7 @@ private:
+@@ -2969,7 +2993,7 @@ private:
 
 void fpe_rasterizeLine_task232012()
 {
@@ -76,7 +76,7 @@ index 45798cc527..de3f156cae 100644
     QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
     img.fill(0x0);
     QPainter p(&img);
-@@ -2944,7 +2968,7 @@ void fpe_rasterizeLine_task232012()
+@@ -2981,7 +3005,7 @@ void fpe_rasterizeLine_task232012()
 
 void fpe_pixmapTransform()
 {
@@ -85,7 +85,7 @@ index 45798cc527..de3f156cae 100644
 
     QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
 
-@@ -2972,7 +2996,7 @@ void fpe_pixmapTransform()
+@@ -3009,7 +3033,7 @@ void fpe_pixmapTransform()
 
 void fpe_zeroLengthLines()
 {
@@ -94,7 +94,7 @@ index 45798cc527..de3f156cae 100644
 
     QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
 
-@@ -2984,7 +3008,7 @@ void fpe_zeroLengthLines()
+@@ -3021,7 +3045,7 @@ void fpe_zeroLengthLines()
 
 void fpe_divByZero()
 {
@@ -103,7 +103,7 @@ index 45798cc527..de3f156cae 100644
 
     QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
 
-@@ -3007,7 +3031,7 @@ void fpe_divByZero()
+@@ -3044,7 +3068,7 @@ void fpe_divByZero()
 
 void fpe_steepSlopes()
 {
@@ -112,7 +112,7 @@ index 45798cc527..de3f156cae 100644
 
     QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied);
 
-@@ -3026,7 +3050,7 @@ void fpe_steepSlopes()
+@@ -3063,7 +3087,7 @@ void fpe_steepSlopes()
 
 void fpe_radialGradients()
 {
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -27,12 +27,10 @@ SRC_URI += "\
    file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
    file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
    file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
-    file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
    file://0013-Disable-ltcg-for-host_build.patch \
    file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
    file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
    file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
    file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
    file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
 "
@@ -60,6 +58,7 @@ PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev widgets tools libs freet
    ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
 "

 PACKAGECONFIG ?= " \
@@ -181,7 +180,6 @@ LDFLAGS_append_riscv64 = " -pthread"

 QT_CONFIG_FLAGS += " \
    ${QT_CONFIG_FLAGS_GOLD} \
-    -shared \
    -silent \
    -no-pch \
    -no-rpath \
@@ -304,4 +302,4 @@ sed -i \
    $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
 }

-SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9"
+SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtdeclarative qtmultimedia"

-SRCREV = "f74ba98f354e222211da5674294567282c088386"
+SRCREV = "a67f812548b008e3eedcd2bb9313828a195fd23b"

 # The same issue as in qtbase:
 # http://errors.yoctoproject.org/Errors/Details/152641/
--- a/recipes-qt/qt5/qtcoap_git.bb
+++ b/recipes-qt/qt5/qtcoap_git.bb
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"

 DEPENDS += "qtbase"

-SRCREV = "432c369082c581c81b60950bf7cfaf1a003c8681"
+SRCREV = "628d3b8abd47ffde45252cf6591ed10ec2fa28ac"
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"

 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"

-SRCREV = "976a92fdd702e4d1afd5fd5cc1181d71978720c2"
+SRCREV = "ca6cc606d9fc0947ea6c27738a1ca8f12f3258ea"
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"

-SRCREV = "64c75931c1aa7250a28a2f2493b5965ba26cc38e"
+SRCREV = "1168c788a117e4556e6cd0ba1e267a86ef62b0c4"
--- a/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
+++ b/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
@@ -1,57 +0,0 @@
-From cfbc554f137ce5ee6497045fc23ebe8576361786 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 26 Nov 2019 21:10:03 -0800
-Subject: [PATCH] Use python3 explicitly
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- qtdeclarative.pro                         | 2 +-
- src/3rdparty/masm/masm.pri                | 4 ++--
- tests/auto/qml/ecmascripttests/test262.py | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/qtdeclarative.pro b/qtdeclarative.pro
-index 5b94da9b69..0e3496ce80 100644
--- a/qtdeclarative.pro
-+++ b/qtdeclarative.pro
-@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
- load(qt_parts)
- 
- !python_available {
-    py_out = $$system('python -c "print(1)"')
-+    py_out = $$system('python3 -c "print(1)"')
-     !equals(py_out, 1): error("Building QtQml requires Python.")
-     tmp = python_available
-     CONFIG += $$tmp
-diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
-index 1df4585aae..00038104ec 100644
--- a/src/3rdparty/masm/masm.pri
-+++ b/src/3rdparty/masm/masm.pri
-@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
-     udis86.output = udis86_itab.h
-     udis86.input = ITAB
-     udis86.CONFIG += no_link
-    udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
-+    udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
-     QMAKE_EXTRA_COMPILERS += udis86
- 
-     udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
-@@ -111,7 +111,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
- retgen.script = $$PWD/yarr/create_regex_tables
- retgen.input = retgen.script
- retgen.CONFIG += no_link
-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
-+retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT}
- QMAKE_EXTRA_COMPILERS += retgen
- 
- # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
-diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py
-index 19551e3ba2..bf3f79a45f 100755
--- a/tests/auto/qml/ecmascripttests/test262.py
-+++ b/tests/auto/qml/ecmascripttests/test262.py
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- #############################################################################
- ##
- ## Copyright (C) 2017 The Qt Company Ltd.
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = " \
 # 5.15.meta-qt5.1
 SRC_URI += " \
    file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \
-    file://0002-Use-python3-explicitly.patch \
 "

 LDFLAGS_append_riscv64 = " -pthread"
@@ -33,6 +32,6 @@ do_install_append_class-nativesdk() {
    rm -rf ${D}${OE_QMAKE_PATH_QML}
 }

-SRCREV = "0fafffedf4857f6bdd8e54b72ab806594ef5674b"
+SRCREV = "104eae5b17b0ec700391e9539ee3a4f638588194"

 BBCLASSEXTEND =+ "native nativesdk"
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"

 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"

-SRCREV = "3c670af801d9ff2273e89e28d5dac8c2666a9d2c"
+SRCREV = "ff933a4e72826a77c81c4153f1adcf765ead35f0"
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
 # http://errors.yoctoproject.org/Errors/Build/44912/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

-SRCREV = "580ab04ff7a623193061f1fbe54bc2ae7744cfe8"
+SRCREV = "66b7fbaca4b323dce337e87e3093c8836577c561"
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"

 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"

-SRCREV = "bb01d126bc1bfc2193a0bbe1e92587ff2aec65cd"
+SRCREV = "74a5bc4a45195b876454e596e76cb23aeb365410"
--- a/recipes-qt/qt5/qtknx_git.bb
+++ b/recipes-qt/qt5/qtknx_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase"

-SRCREV = "1ab6ae377230693817be63ee2768aaa6d586a00a"
+SRCREV = "0d2ce613010c0cc9c69f6821c06a34b6721482b4"
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -35,7 +35,7 @@ SRC_URI += " \
    ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
 "

-SRCREV_qtlocation = "38eed6e327bb2fa115975a58e9866fc514b6f01c"
-SRCREV_qtlocation-mapboxgl = "d7e368c42f2ac7971e81f60b981e566352f1e4fa"
+SRCREV_qtlocation = "02a21217a9706402802f38c646797be8eccb86e4"
+SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d"

 SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
--- a/recipes-qt/qt5/qtlottie_git.bb
+++ b/recipes-qt/qt5/qtlottie_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtdeclarative"

-SRCREV = "e40d61929ee0b8dde8b807e1a45e8067939f7db0"
+SRCREV = "b182dcd78a35b4667b2568857b7719d555c7fddb"
--- a/recipes-qt/qt5/qtmqtt_git.bb
+++ b/recipes-qt/qt5/qtmqtt_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase"

-SRCREV = "7c30a943b39696f673f72b7131d6395ab8bdbf40"
+SRCREV = "cade213f562049400da81e60762400df68d7c56b"
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -38,7 +38,7 @@ SRC_URI += "\
 # http://errors.yoctoproject.org/Errors/Build/44914/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

-SRCREV = "040378a91fee4aa1e0740e1e5d3438e652b6f2eb"
+SRCREV = "fd30913d4601d12437404e1d20113a1ed6364ccc"

 # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
 do_install_append() {
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc

 DEPENDS += "qtbase"

-SRCREV = "0bbe1a2a2a345ab85cdef2fae900ae35eb8cc9cb"
+SRCREV = "fb2d6d47a0c961278d63309789a1141c3734818b"
--- a/recipes-qt/qt5/qtopcua_git.bb
+++ b/recipes-qt/qt5/qtopcua_git.bb
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""

 DEPENDS += "qtbase"

-SRCREV = "b32fd40e4ce5f530c1d41d9d11916605f1969518"
+SRCREV = "6d45793cae6f9e744c7bba82f905e431978ce3d0"
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtdeclarative"

-SRCREV = "b80b526f8faf56ce529eeee1de5d62e809d1105c"
+SRCREV = "ddfa4d16243128d2871a51c513e025d518151b17"
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \
  ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
 "

-SRCREV_qtquick3d = "8e25bfb103fe9e619ab78af4a20eb6838026a6ec"
+SRCREV_qtquick3d = "2e05e6d6546635a8f25882c5140fb17697be0062"
 SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"

 SRCREV_FORMAT = "qtquick3d_assimp"
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtdeclarative qtdeclarative-native"

-SRCREV = "7c3b169c73c58280b07f1b1a3d5b779d38f340b1"
+SRCREV = "16f27dfa3588c2bf377568ce00bf534af48c9558"
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
  ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
 "

-SRCREV = "e8414d5bc37d1391f45af866055a8448acbb2271"
+SRCREV = "7c29283041a50def3ceca7de4471f211c9b30d4e"
--- a/recipes-qt/qt5/qtquicktimeline_git.bb
+++ b/recipes-qt/qt5/qtquicktimeline_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS = "qtbase qtdeclarative"

-SRCREV = "7848c053ff7e1ee4a0101c8f979b8accc4cf8308"
+SRCREV = "147ad75c589fc4804429710fdb177cc48a80dbea"
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"

 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"

-SRCREV = "121cc9f23b422127f0aa99d436a2e40bfcbd6255"
+SRCREV = "8e889442508e284691c923470eb4552c96afdfe3"

 BBCLASSEXTEND += "native nativesdk"
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -36,4 +36,4 @@ DEPENDS += "qtbase"
 # http://errors.yoctoproject.org/Errors/Build/44915/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

-SRCREV = "20aefbbae19be42e894f1bc2ecf951c5c32fca70"
+SRCREV = "5da7de1800eee3d604eb7e787b114479b61ffc93"
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc

 DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"

-SRCREV = "126e70d6247ef345b4d49de6945111883e1212aa"
+SRCREV = "95aa78be795a862b95371afa75e1417029ec0a16"

 # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15
 # 5.15.meta-qt5.1
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtdeclarative"

-SRCREV = "32587e8b2b656710d90a36a8a856db14d9cc819b"
+SRCREV = "5618198e6df5e0224f79f786a44af7527b431545"
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtserialport"

-SRCREV = "1b020b7d4ebf2de0f2d6641b067dfe3a6b9dfbfe"
+SRCREV = "1aa9b03756baead139943712839af5ecedeb2989"
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase"

-SRCREV = "430d7bc8c76bcf3154f87212811729eb484d9309"
+SRCREV = "192e376b01e65e7277772bdc94106613c22cf531"
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase"

-SRCREV = "d0a46439a58a6630b4fd927347275ce2698097f9"
+SRCREV = "52d3788c7b0116ea3db232dccca5f1e3f1e229ac"
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -39,6 +39,7 @@ EXTRA_QMAKEVARS_PRE += " \
    ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
    ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \
 "
-SRCREV = "6a85b6150554111f7d473d56addfe5a8b5da4400"
+SRCREV = "cc52debd905e0ed061290d6fd00a5f1ab67478a5"

 BBCLASSEXTEND = "native nativesdk"
+
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
    ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
 "

-SRCREV = "383fe04ff98fb4b07e24e0c1addce380e0d12cfd"
+SRCREV = "cb1857418b36780b0444333f3aa6250ca3780f19"
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"

 DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"

-SRCREV = "39a9e7a6f72d14808a983ce1e678e22ee2fd57b5"
+SRCREV = "7b90415c58dd02c682a9ba317f273d7b3398ff88"
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -22,6 +22,7 @@ PACKAGECONFIG ?= " \
    wayland-server \
    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'wayland-egl', '', d)} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'wayland-vulkan-server-buffer', '', d)} \
 "
 PACKAGECONFIG_class-native ?= ""
 PACKAGECONFIG_class-nativesdk ?= ""
@@ -38,10 +39,11 @@ PACKAGECONFIG[wayland-egl] = "-feature-wayland-egl,-no-feature-wayland-egl,virtu
 PACKAGECONFIG[wayland-brcm] = "-feature-wayland-brcm,-no-feature-wayland-brcm,virtual/egl"
 PACKAGECONFIG[wayland-drm-egl-server-buffer] = "-feature-wayland-drm-egl-server-buffer,-no-feature-wayland-drm-egl-server-buffer,libdrm virtual/egl"
 PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris-egl-server-buffer,-no-feature-wayland-libhybris-egl-server-buffer,libhybris"
+PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-buffer,-no-feature-wayland-vulkan-server-buffer,vulkan-headers"

 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"

-SRCREV = "0f847b7688af376c22b1d040d0b140c88444d8bc"
+SRCREV = "3cc17177b1b03053276eb6236fda137c588261a7"

 BBCLASSEXTEND =+ "native nativesdk"

--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtdeclarative qtwebsockets"

-SRCREV = "7e48e3bb4b4c61a37343e07cae5fd9fb8a5cddd7"
+SRCREV = "90cffd49575b075b0dc28440c693753d860fee87"
--- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
@@ -1,4 +1,4 @@
-From 178aefa97fd7b725b1b802af7751df5f86a887af Mon Sep 17 00:00:00 2001
+From cc707f6c2d3dd152fcca23de0545351e99b3edcb Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 14 Dec 2017 11:28:10 +0200
 Subject: [PATCH] musl: link against libexecinfo
@@ -10,13 +10,13 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/core/core_module.pro b/src/core/core_module.pro
-index 5007012a..56c7ad4a 100644
+index 3b439e81..b1669e19 100644
 --- a/src/core/core_module.pro
 +++ b/src/core/core_module.pro
-@@ -57,7 +57,7 @@ linux {
- POST_TARGETDEPS += $$NINJA_TARGETDEPS
- 
+@@ -5,7 +5,7 @@ include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri)
 
+ api_library_name = qtwebenginecoreapi$$qtPlatformTargetSuffix()
+ api_library_path = $$OUT_PWD/api/$$getConfigDir()
 -LIBS_PRIVATE += -L$$api_library_path
 +LIBS_PRIVATE += -L$$api_library_path -lexecinfo
 CONFIG *= no_smart_library_merge
--- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
@@ -5,22 +5,44 @@ Subject: [PATCH] mkspecs: Allow builds with libc != glibc

 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- src/buildtools/config/support.pri | 5 -----
- 1 file changed, 5 deletions(-)
+ src/buildtools/config/support.pri | 4 ----
+ src/buildtools/configure.json     | 4 +---
+ 2 files changed, 1 insertion(+), 7 deletions(-)

 diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
-index 8077b12f..aaf4db47 100644
+index 6768f0a1..1885f1b4 100644
 --- a/src/buildtools/config/support.pri
 +++ b/src/buildtools/config/support.pri
-@@ -97,11 +97,6 @@ defineTest(qtwebengine_checkErrorForLinux) {
-         return(false)
-     }
+@@ -177,10 +177,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) {
 
+ defineTest(qtwebengine_checkForGlibc) {
+     module = $$1
 -    !qtConfig(webengine-system-glibc) {
-        qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.")
+-        qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.")
 -        return(false)
 -    }
-
-     !qtConfig(webengine-system-khr) {
-         qtwebengine_skipBuild("Khronos development headers required to build QtWebEngine are missing (see mesa/libegl1-mesa-dev)")
-         return(false)
+     return(true)
+ }
+ 
+diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
+index 96727a14..fef8fc5e 100644
+--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
+@@ -371,7 +371,6 @@
+                          && (!config.sanitizer || features.webengine-sanitizer)
+                          && (!config.linux || features.pkg-config)
+                          && (!config.linux || features.webengine-host-pkg-config)
+-                         && (!config.linux || features.webengine-system-glibc)
+                          && (!config.linux || features.webengine-system-khr)
+                          && (!config.linux || features.webengine-system-nss)
+                          && (!config.linux || features.webengine-system-dbus)
+@@ -732,8 +731,7 @@
+                         "webengine-system-fontconfig",
+                         "webengine-system-dbus",
+                         "webengine-system-nss",
+-                        "webengine-system-khr",
+-                        "webengine-system-glibc"
+                        "webengine-system-khr"
+                     ]
+                 },
+                 {
--- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
@@ -1,4 +1,4 @@
-From 105421c09f009b77019e60db2de22d5966a73602 Mon Sep 17 00:00:00 2001
+From 5af62581e5116b57efbe4bb7cc467efeb0aab941 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 30 Mar 2017 11:37:24 +0300
 Subject: [PATCH] chromium: workaround for too long .rps file name
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
@@ -1,4 +1,4 @@
-From 99453086770508f96eeb95635dda3f9831c485bf Mon Sep 17 00:00:00 2001
+From 8dd7987fc70fd8dab4a9f7ee32334c8d28ed34e4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 23 Dec 2018 16:58:04 -0800
 Subject: [PATCH] chromium: stack pointer clobber
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
-index 8e0cc385792..d2bd9df4d40 100644
+index d2baee9d243..fd8efdffea6 100644
 --- a/chromium/third_party/lss/linux_syscall_support.h
 +++ b/chromium/third_party/lss/linux_syscall_support.h
-@@ -2012,7 +2012,7 @@ struct kernel_statfs {
+@@ -2017,7 +2017,7 @@ struct kernel_statfs {
                              : "i" (__NR_##name), "ri" ((long)(arg1)),        \
                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
@@ -29,7 +29,7 @@ index 8e0cc385792..d2bd9df4d40 100644
         LSS_RETURN(type,__res);                                               \
       }
     #undef  _syscall6
-@@ -2034,7 +2034,7 @@ struct kernel_statfs {
+@@ -2039,7 +2039,7 @@ struct kernel_statfs {
                              : "i" (__NR_##name),  "0" ((long)(&__s)),        \
                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
@@ -38,7 +38,7 @@ index 8e0cc385792..d2bd9df4d40 100644
         LSS_RETURN(type,__res);                                               \
       }
     LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
-@@ -2120,7 +2120,7 @@ struct kernel_statfs {
+@@ -2125,7 +2125,7 @@ struct kernel_statfs {
                            : "0"(-EINVAL), "i"(__NR_clone),
                              "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
                              "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
@@ -1,4 +1,4 @@
-From d3889654a28d901d345cae8fc8ec23988a085dab Mon Sep 17 00:00:00 2001
+From be18ba6e0b879fbd542f4e0d1a249f2ab5abb27c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 2 Feb 2019 19:28:59 -0800
 Subject: [PATCH] chromium: fix build with clang
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 2 insertions(+), 25 deletions(-)

 diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
-index fdfcf65f5ab..13d71d04030 100644
+index ca81bd8ce0f..d3c588b21e3 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -779,8 +779,6 @@ config("compiler_cpu_abi") {
+@@ -776,8 +776,6 @@ config("compiler_cpu_abi") {
       }
     } else if (current_cpu == "arm") {
       if (is_clang && !is_android && !is_nacl) {
@@ -22,7 +22,7 @@ index fdfcf65f5ab..13d71d04030 100644
       }
       if (!is_nacl) {
         cflags += [
-@@ -793,8 +791,6 @@ config("compiler_cpu_abi") {
+@@ -790,8 +788,6 @@ config("compiler_cpu_abi") {
       }
     } else if (current_cpu == "arm64") {
       if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -31,7 +31,7 @@ index fdfcf65f5ab..13d71d04030 100644
       }
     } else if (current_cpu == "mipsel" && !is_nacl) {
       ldflags += [ "-Wl,--hash-style=sysv" ]
-@@ -803,9 +799,6 @@ config("compiler_cpu_abi") {
+@@ -800,9 +796,6 @@ config("compiler_cpu_abi") {
           if (is_android) {
             cflags += [ "--target=mipsel-linux-android" ]
             ldflags += [ "--target=mipsel-linux-android" ]
@@ -41,7 +41,7 @@ index fdfcf65f5ab..13d71d04030 100644
           }
         } else {
           cflags += [ "-EL" ]
-@@ -884,10 +877,7 @@ config("compiler_cpu_abi") {
+@@ -881,10 +874,7 @@ config("compiler_cpu_abi") {
     } else if (current_cpu == "mips" && !is_nacl) {
       ldflags += [ "-Wl,--hash-style=sysv" ]
       if (custom_toolchain == "") {
@@ -53,7 +53,7 @@ index fdfcf65f5ab..13d71d04030 100644
           cflags += [ "-EB" ]
           ldflags += [ "-EB" ]
         }
-@@ -934,9 +924,6 @@ config("compiler_cpu_abi") {
+@@ -931,9 +921,6 @@ config("compiler_cpu_abi") {
           if (is_android) {
             cflags += [ "--target=mips64el-linux-android" ]
             ldflags += [ "--target=mips64el-linux-android" ]
@@ -63,7 +63,7 @@ index fdfcf65f5ab..13d71d04030 100644
           }
         } else {
           cflags += [
-@@ -993,10 +980,7 @@ config("compiler_cpu_abi") {
+@@ -990,10 +977,7 @@ config("compiler_cpu_abi") {
     } else if (current_cpu == "mips64") {
       ldflags += [ "-Wl,--hash-style=sysv" ]
       if (custom_toolchain == "") {
@@ -75,7 +75,7 @@ index fdfcf65f5ab..13d71d04030 100644
           cflags += [
             "-EB",
             "-mabi=64",
-@@ -1165,13 +1149,6 @@ config("compiler_deterministic") {
+@@ -1157,13 +1141,6 @@ config("compiler_deterministic") {
       }
     }
   }
--- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -1,4 +1,4 @@
-From 7a778d56065b041e55c60e500d5e60c71b7e345f Mon Sep 17 00:00:00 2001
+From 7eeed60fceeca490c5252e256baff08100e13259 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 5 Feb 2019 14:32:20 -0800
 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 4 insertions(+), 1 deletion(-)

 diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
-index 4422fecc0c8..1b398ad981a 100644
+index 00d1e7c6ca3..f2c36d72dd2 100644
 --- a/chromium/third_party/zlib/BUILD.gn
 +++ b/chromium/third_party/zlib/BUILD.gn
-@@ -80,8 +80,11 @@ if (use_arm_neon_optimizations) {
+@@ -86,8 +86,11 @@ if (use_arm_neon_optimizations) {
     # Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
     #  "All implementations of the ARMv8.1 architecture are required to
     #   implement the CRC32* instructions. These are optional in ARMv8.0."
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
@@ -1,7 +1,8 @@
-From 7cabdbd5f444dc10f4c87ed554792e97a527075b Mon Sep 17 00:00:00 2001
+From 0faac107930255380ea07aa75267153022de2248 Mon Sep 17 00:00:00 2001
 From: Johannes Pointner <johannes.pointner@br-automation.com>
 Date: Fri, 3 May 2019 09:12:38 +0200
 Subject: [PATCH] chromium: Do not try to set the guessed values for
+
 march/mtune/float-abi OE config machinary has computed these values already
 and fed it via compiler cmdline to chromium build

@@ -12,15 +13,17 @@ Upstream-Status: Inappropriate [OE-Specific]

 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
+
+%% original patch: 0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
 ---
 chromium/build/config/compiler/BUILD.gn | 9 ---------
 1 file changed, 9 deletions(-)

 diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
-index 13d71d04030..3ebcf1ddbc3 100644
+index d3c588b21e3..6d49fde33cc 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -780,15 +780,6 @@ config("compiler_cpu_abi") {
+@@ -777,15 +777,6 @@ config("compiler_cpu_abi") {
     } else if (current_cpu == "arm") {
       if (is_clang && !is_android && !is_nacl) {
       }
--- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
@@ -1,4 +1,4 @@
-From e7e0646f07d1c0dcf6502cd1c074d50839f3d461 Mon Sep 17 00:00:00 2001
+From 69abe5acb926cef9ac771015ade3873fa9985f3b Mon Sep 17 00:00:00 2001
 From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 Date: Thu, 8 Mar 2018 15:39:55 +0100
 Subject: [PATCH] chromium: aarch64 skia build fix
@@ -28,7 +28,7 @@ Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 1 file changed, 2 insertions(+), 15 deletions(-)

 diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
-index 0d610ccfe33..c1844b61168 100644
+index 831f5b3bb03..bb9377c3641 100644
 --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
 +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
@@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) {
--- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
@@ -1,4 +1,4 @@
-From a5cdae084e84be8c847f4b0613b92e0462bbb038 Mon Sep 17 00:00:00 2001
+From 8a0cc2a6be8fb9f8c3f4976ad4b41b291e672a67 Mon Sep 17 00:00:00 2001
 From: Jiri Slaby <jslaby@suse.cz>
 Date: Thu, 11 Jul 2019 09:35:13 +0200
 Subject: [PATCH] chromium: fix build after y2038 changes in glibc
@@ -15,7 +15,7 @@ Upstream-Status: Pending
 1 file changed, 1 insertion(+)

 diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
-index ead4e57dc15..7ba975e660a 100644
+index 0cbcb8130c6..bc3dd3bddda 100644
 --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
 +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
@@ -71,6 +71,7 @@ typedef void* SockOptArg;
--- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -1,4 +1,4 @@
-From c769d6be7210a2fbc866e36f87ad21bcc91e9c6e Mon Sep 17 00:00:00 2001
+From ddedffaeb9f04ac8530f87f5010e0008dc548b96 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 30 Nov 2019 10:07:43 -0800
 Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
@@ -11,58 +11,37 @@ input.h [1]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- chromium/ui/events/ozone/evdev/event_converter_evdev.cc    | 4 ++--
- chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++---
- chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h  | 5 +++++
- 3 files changed, 10 insertions(+), 5 deletions(-)
+ chromium/ui/events/ozone/evdev/event_converter_evdev.h     | 5 +++++
+ chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 3 +--
+ 2 files changed, 6 insertions(+), 2 deletions(-)

-diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
-index 9f27d39e209..f565dd2ce5c 100644
--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
-+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
-@@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback(
- base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent(
-     const input_event& event) {
-   base::TimeTicks timestamp =
-      ui::EventTimeStampFromSeconds(event.time.tv_sec) +
-      base::TimeDelta::FromMicroseconds(event.time.tv_usec);
-+      ui::EventTimeStampFromSeconds(event.input_event_sec) +
-+      base::TimeDelta::FromMicroseconds(event.input_event_usec);
-   ValidateEventTimeClock(&timestamp);
-   return timestamp;
- }
-diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
-index 363c3183e05..4fccfd62f84 100644
--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
-+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
-@@ -59,11 +59,11 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
-   for (int i = 0; i < kDebugBufferSize; ++i) {
-     struct TouchEvent* te =
-         &logged_events_[(debug_buffer_tail_ + i) % kDebugBufferSize];
-    if (te->ev.time.tv_sec == 0 && te->ev.time.tv_usec == 0)
-+    if (te->ev.input_event_sec == 0 && te->ev.input_event_usec == 0)
-       continue;
-     std::string event_string = base::StringPrintf(
-        "E: %ld.%06ld %04x %04x %d %d\n", te->ev.time.tv_sec,
-        te->ev.time.tv_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
-+        "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
-+        te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
-     report_content += event_string;
-   }
-   file.Write(0, report_content.c_str(), report_content.length());
-diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
-index 0d5b83148f6..1f17608e94d 100644
--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
-+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
-@@ -14,6 +14,11 @@
- 
- #include "base/component_export.h"
+diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
+index 717410f2ebc..a4cd55ca20e 100644
+--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
+@@ -20,6 +20,11 @@
+ #include "ui/events/ozone/evdev/event_dispatch_callback.h"
+ #include "ui/gfx/geometry/size.h"
 
 +#ifndef input_event_sec
 +#define input_event_sec time.tv_sec
 +#define input_event_usec time.tv_usec
 +#endif
 +
- namespace ui {
+ struct input_event;
 
- class EventDeviceInfo;
+ namespace ui {
+diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
+index 01e49b7bbfd..4fccfd62f84 100644
+--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
+@@ -63,8 +63,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
+       continue;
+     std::string event_string = base::StringPrintf(
+         "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
+-        te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value,
+-        te->slot);
+        te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
+     report_content += event_string;
+   }
+   file.Write(0, report_content.c_str(), report_content.length());
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
@@ -1,4 +1,4 @@
-From 58783bf8f46657200643543f765f405a91699440 Mon Sep 17 00:00:00 2001
+From 022100d701dca71ecfe237e133712398bc1c59a7 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 25 Dec 2019 15:41:16 -0800
 Subject: [PATCH] chromium: Include cstddef for size_t definition
@@ -22,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 1 insertion(+)

 diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-index b87fb2d0345..b3faffcfc79 100644
+index ec972949d89..2a76775cfb6 100644
 --- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
 +++ b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
 #include <map>
 #include <set>
 #include <vector>
--- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
@@ -1,4 +1,4 @@
-From faff740bb831e1a25c7acb1754df9bbd028330b9 Mon Sep 17 00:00:00 2001
+From 9d9db26e626e1c8d4d10eab1522daf0efc8cb11c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 2 Jan 2020 17:13:55 -0800
 Subject: [PATCH] chromium: Move CharAllocator definition to a header file
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
@@ -1,4 +1,4 @@
-From 33005dfa49d65170fb006cd4ca4dbb8c6cf901e5 Mon Sep 17 00:00:00 2001
+From 1b8d57ba6595bbd743f6570d834f6a08600fb117 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 15 Jan 2020 16:53:46 -0800
 Subject: [PATCH] chromium: Include <cstddef> and <cstdint>
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
@@ -1,4 +1,4 @@
-From 910fe61d3ee439b26a6a33cc9f65e1f7a52f332d Mon Sep 17 00:00:00 2001
+From e60314a1257964bbebc0e7633d9799fd7c7ec35b Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 1 Feb 2020 12:17:23 -0800
 Subject: [PATCH] chromium: Link v8 with libatomic on x86
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn
-index 9107b302476..12d8171d238 100644
+index ab20142de9a..4ef4aa80cc0 100644
 --- a/chromium/v8/BUILD.gn
 +++ b/chromium/v8/BUILD.gn
-@@ -3324,7 +3324,8 @@ v8_source_set("v8_base_without_compiler") {
+@@ -3543,7 +3543,8 @@ v8_source_set("v8_base_without_compiler") {
   if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" ||
       v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" ||
       v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" ||
--- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch
@@ -1,52 +0,0 @@
-From 3ccc10f378ca26c35104e39e08771c053ae5b19e Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Fri, 14 Aug 2020 16:38:48 +0200
-Subject: [PATCH] chromium: Fix bison 3.7
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Do a replace run inspired by newer versions of the script.
-
-Fixes: QTBUG-86018
-Change-Id: Ib1dc771e22a662aff0fae842d135ad58fad08bc1
-Reviewed-by: Michael Brüning <michael.bruning@qt.io>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- .../renderer/build/scripts/rule_bison.py      | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-index f75e25fd23f..7e0767e951a 100755
--- a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-+++ b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-@@ -45,6 +45,19 @@ from utilities import abs
- 
- from blinkbuild.name_style_converter import NameStyleConverter
- 
-+def modify_file(path, prefix_lines, suffix_lines, replace_list=[]):
-+    prefix_lines = map(lambda s: s + '\n', prefix_lines)
-+    suffix_lines = map(lambda s: s + '\n', suffix_lines)
-+    with open(path, 'r') as f:
-+        old_lines = f.readlines()
-+    for i in range(len(old_lines)):
-+        for src, dest in replace_list:
-+            old_lines[i] = old_lines[i].replace(src, dest)
-+    new_lines = prefix_lines + old_lines + suffix_lines
-+    with open(path, 'w') as f:
-+        f.writelines(new_lines)
-+
-+
- assert len(sys.argv) == 4 or len(sys.argv) == 5
- 
- inputFile = abs(sys.argv[1])
-@@ -115,3 +128,9 @@ print >>outputHFile, '#define %s' % headerGuard
- print >>outputHFile, outputHContents
- print >>outputHFile, '#endif  // %s' % headerGuard
- outputHFile.close()
-+
-+common_replace_list = [(inputRoot + '.hh',
-+                        inputRoot + '.h')]
-+modify_file(
-+    outputCpp, [], [],
-+    replace_list=common_replace_list)
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
@@ -1,4 +1,4 @@
-From 8c9a4027426b0a2c56cc834da0dbad5b8378c2c6 Mon Sep 17 00:00:00 2001
+From 344e8a3945a29239dd2f27ea4969e3d64d5d8911 Mon Sep 17 00:00:00 2001
 From: Andrej Valek <andrej.valek@siemens.com>
 Date: Fri, 17 Apr 2020 09:43:32 +0200
 Subject: [PATCH] chromium: icu: use system library only targets
@@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 1 file changed, 14 insertions(+), 4 deletions(-)

 diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
-index 023d6e13a2c..312f34d6186 100644
+index 73673fa20ac..a656692c7bf 100644
 --- a/chromium/third_party/icu/BUILD.gn
 +++ b/chromium/third_party/icu/BUILD.gn
@@ -7,9 +7,13 @@ import("//build/config/host_byteorder.gni")
@@ -37,9 +37,9 @@ index 023d6e13a2c..312f34d6186 100644
 }
 
 if (is_android) {
-@@ -20,6 +24,12 @@ if (is_mac) {
-   import("//build/config/sanitizers/sanitizers.gni")
- }
+@@ -23,6 +27,12 @@ if (is_mac) {
+ assert(!icu_disable_thin_archive || !is_component_build,
+        "icu_disable_thin_archive only works in static library builds")
 
 +if (use_system_icu) {
 +  # Use system library only for target, otherwise use bundled
@@ -50,7 +50,7 @@ index 023d6e13a2c..312f34d6186 100644
 # Meta target that includes both icuuc and icui18n. Most targets want both.
 # You can depend on the individually if you need to.
 group("icu") {
-@@ -1207,7 +1217,7 @@ config("system_icu_config") {
+@@ -1222,7 +1232,7 @@ config("system_icu_config") {
   }
 }
 
@@ -59,7 +59,7 @@ index 023d6e13a2c..312f34d6186 100644
   pkg_config("system_icui18n") {
     packages = [ "icu-i18n" ]
   }
-@@ -1420,7 +1430,7 @@ shim_headers("icuuc_shim") {
+@@ -1435,7 +1445,7 @@ shim_headers("icuuc_shim") {
 }
 
 config("icu_config") {
@@ -68,7 +68,7 @@ index 023d6e13a2c..312f34d6186 100644
     configs = [ ":system_icu_config"]
   } else {
     configs = [ ":bundled_icu_config"]
-@@ -1428,7 +1438,7 @@ config("icu_config") {
+@@ -1443,7 +1453,7 @@ config("icu_config") {
 }
 
 group("icuuc") {
@@ -77,7 +77,7 @@ index 023d6e13a2c..312f34d6186 100644
     deps = [ ":icuuc_shim" ]
     public_configs = [
       ":system_icu_config",
-@@ -1440,7 +1450,7 @@ group("icuuc") {
+@@ -1455,7 +1465,7 @@ group("icuuc") {
 }
 
 group("icui18n") {
--- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
@@ -1,24 +0,0 @@
-From 1902fc967d6f900a4e918e56f21bc856a0462e4c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 7 Jul 2017 15:12:39 -0700
-Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
- LinuxSigInfo
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc
-index 003708d2c89..0fef3148f9d 100644
--- a/chromium/sandbox/linux/seccomp-bpf/trap.cc
-+++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc
-@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
-   // most versions of glibc don't include this information in siginfo_t. So,
-   // we need to explicitly copy it into a arch_sigsys structure.
-   struct arch_sigsys sigsys;
-  memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
-+  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
- 
- #if defined(__mips__)
-   // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the
--- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] chromium: musl: Adjust default pthread stack size

 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- chromium/base/threading/platform_thread_linux.cc              | 3 ++-
- .../third_party/blink/renderer/platform/wtf/stack_util.cc     | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ chromium/base/threading/platform_thread_linux.cc               | 3 ++-
+ chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)

 diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
-index 095c49b8dc0..d1479b54d48 100644
+index 74a01ad5af5..dab5773d73b 100644
 --- a/chromium/base/threading/platform_thread_linux.cc
 +++ b/chromium/base/threading/platform_thread_linux.cc
-@@ -186,7 +186,8 @@ void TerminateOnThread() {}
+@@ -377,7 +377,8 @@ void TerminateOnThread() {}
 
 size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
 #if !defined(THREAD_SANITIZER)
@@ -24,15 +24,15 @@ index 095c49b8dc0..d1479b54d48 100644
   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
   // default stack size isn't enough for some browser tests.
 diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
-index b2421649ff3..a31b96e90e6 100644
+index ab1dff4167e..b0763b0bd9a 100644
 --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
 +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
 // correctly for the main thread.
 
-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
     defined(OS_FUCHSIA)
   // pthread_getattr_np() can fail if the thread is not invoked by
   // pthread_create() (e.g., the main thread of blink_unittests).
--- a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 5 insertions(+)

 diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
-index d2bd9df4d40..88ea7f508aa 100644
+index fd8efdffea6..22a8863031c 100644
 --- a/chromium/third_party/lss/linux_syscall_support.h
 +++ b/chromium/third_party/lss/linux_syscall_support.h
-@@ -1239,6 +1239,11 @@ struct kernel_statfs {
+@@ -1244,6 +1244,11 @@ struct kernel_statfs {
 #ifndef __NR_fallocate
 #define __NR_fallocate          285
 #endif
--- a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 6 insertions(+), 2 deletions(-)

 diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc
-index 572472a6993..504fdb5d5c6 100644
+index 7df6892d67e..030ff8896e4 100644
 --- a/chromium/net/socket/udp_socket_posix.cc
 +++ b/chromium/net/socket/udp_socket_posix.cc
-@@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
+@@ -1199,8 +1199,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
   for (auto& buffer : buffers)
     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
   msgvec->reserve(buffers.size());
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -23,6 +23,8 @@ DEPENDS += " \
    qtlocation \
    libdrm fontconfig pixman openssl pango cairo pciutils nss \
    libcap \
+    jpeg-native \
+    freetype-native \
    gperf-native \
    ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \
@@ -43,7 +45,7 @@ SECURITY_STRINGFORMAT = ""

 # To use system ffmpeg you need to enable also libwebp, opus, vpx
 # Only depenedencies available in oe-core are enabled by default
-PACKAGECONFIG ??= "libwebp libevent libpng \
+PACKAGECONFIG ??= "libevent libpng \
                   ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"

 PACKAGECONFIG[icu] = "-feature-webengine-system-icu,-no-feature-webengine-system-icu,icu"
@@ -142,7 +144,7 @@ RDEPENDS_${PN}-examples += " \
    qtdeclarative-qmlplugins \
 "

-QT_MODULE_BRANCH_CHROMIUM = "80-based"
+QT_MODULE_BRANCH_CHROMIUM = "83-based"

 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc
 # 5.15-glibc.meta-qt5.8
@@ -165,7 +167,7 @@ SRC_URI += " \
    file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
    file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
    file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
-    file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
+    file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch;patchdir=src/3rdparty \
    file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \
    file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \
    file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \
@@ -173,7 +175,6 @@ SRC_URI += " \
    file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \
    file://chromium/0011-chromium-Include-cstddef-and-cstdint.patch;patchdir=src/3rdparty \
    file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \
-    file://chromium/0013-chromium-Fix-bison-3.7.patch;patchdir=src/3rdparty \
    file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \
    file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \
    file://chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch;patchdir=src/3rdparty \
@@ -188,7 +189,6 @@ SRC_URI_append_libc-musl = "\
    file://chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
    file://chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
    file://chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
-    file://chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
    file://chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
    file://chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
    file://chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
@@ -198,8 +198,8 @@ SRC_URI_append_libc-musl = "\
    file://chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
 "

-SRCREV_qtwebengine = "f5268555099a1a96f8730035a40f04a473dd396e"
-SRCREV_chromium = "7b2f027ea83c372c33d5b50deb65a2d98244aa04"
+SRCREV_qtwebengine = "5537ff4437ea7a5f9ea140071343f88bf48deddc"
+SRCREV_chromium = "fb6ab5e483876298235be1c6a6013b426c82b759"
 SRCREV = "${SRCREV_qtwebengine}"

 SRCREV_FORMAT = "qtwebengine_chromium"
--- a/recipes-qt/qt5/qtwebglplugin_git.bb
+++ b/recipes-qt/qt5/qtwebglplugin_git.bb
@@ -18,4 +18,4 @@ do_configure_prepend() {

 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"

-SRCREV = "a76d0002b75ecf0ed9ef6ddb1b96056aa324eed7"
+SRCREV = "5e41e564aaf96b7e49403af5099995efbe4cac8e"
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtdeclarative"

-SRCREV = "652818acf91b6447270d667cb9792ffcf066878f"
+SRCREV = "f73735911b2124ef16aa39228bf8f89ee900ba5d"
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -23,4 +23,4 @@ python() {
    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
 }
-SRCREV = "3db7be97488c19e34360bc48cb46605d51876e15"
+SRCREV = "800926cc4e0ecfdb37a3b34486403354b66a37a4"
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase"

-SRCREV = "c8623a37ace095375139500c929d268139ec317a"
+SRCREV = "9bb0adeac84da6723cf57a2bb0d0c3b405691a15"
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -25,6 +25,6 @@ do_configure_prepend() {

 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"

-SRCREV = "27b65209cb65164fbd889bf3a29d2968e0c78f45"
+SRCREV = "50421402f05b3ee3c76c6cff455a69efaf576b6d"

 BBCLASSEXTEND =+ "native nativesdk"