Merge remote-tracking branch 'qt/upstream/master' into 5.14

* qt/upstream/master: (28 commits) qtbase: Use pcre packages by default qt5: use PACKAGECONFIG to disable tests and examples qtlocation: use geoclue 2 qtbase: use offscreen platform plugin for tools qtbase: add openssl PACKAGECONFIG for native nativesdk qtbase-native: disable vulkan support maliit-framework-qt5: fix test installations qtenginio: remove obsolete module ogl-runtime: update to v2.5.0 release qtquick3d: add recipe qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance qt5: Update to Qt 5.14.0 qtbase: Fix patch fuzz detected with devtool qtbase: Backport the patch from upstream gerrit qt5-creator: Update musl patch to link qmldesigner with -lexecinfo qtwebengine: Move CharAllocator definition to header qt5-creator: Add missing dep on libz.so qt5-creator: Make clang-format patch work with multiple clang versions qtwebengine: Include cstddef for size_t definition ... Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
author: Samuli Piippo <samuli.piippo@qt.io> 2020-01-13 15:42:26 +0200
committer: Samuli Piippo <samuli.piippo@qt.io> 2020-01-13 15:57:32 +0200
commit: f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch)
tree: d0094937e85e890e9379d1f1de769af62fb6e656
parent: 9ff0a36249205d36bb44cc34a26cb6201180a89f (diff)
parent: 1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff)
download: meta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz
69 files changed, 943 insertions, 203 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 6e8b2d4f..0fca38e6 100755
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -3,6 +3,7 @@
 DESCRIPTION = "Target packages for Qt5 SDK"
 LICENSE = "MIT"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
@@ -105,8 +106,13 @@ RDEPENDS_${PN} += " \
    qtquickcontrols2-dev \
    qtquickcontrols2-mkspecs \
 "
+RDEPENDS_${PN}_remove_toolchain-clang_riscv32 = "qttools-dev qttools-mkspecs qttools-staticdev qttools-tools"
+RDEPENDS_${PN}_remove_toolchain-clang_riscv64 = "qttools-dev qttools-mkspecs qttools-staticdev qttools-tools"
 RRECOMMENDS_${PN} += " \
    qtquickcontrols-qmlplugins \
    qttools-plugins \
 "
+RRECOMMENDS_${PN}_remove_toolchain-clang_riscv32 = "qttools-plugins"
+RRECOMMENDS_${PN}_remove_toolchain-clang_riscv64 = "qttools-plugins"
diff --git a/recipes-qt/qmllive/qmllive/0001-lib.pro-Append-LIB_ARCH-to-lib.patch b/recipes-qt/qmllive/qmllive/0001-lib.pro-Append-LIB_ARCH-to-lib.patch
new file mode 100644
index 00000000..9a54b902
--- /dev/null
+++ b/recipes-qt/qmllive/qmllive/0001-lib.pro-Append-LIB_ARCH-to-lib.patch
@@ -0,0 +1,39 @@
+From 647b1da38d8c741681de9c89f2090f0edcf25a47 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 19 Dec 2019 13:40:34 -0800
+Subject: [PATCH] lib.pro: Append LIB_ARCH to lib
+appending to lib so it becomes lib64 when needed and LIB_ARCH can be set
+in evnironment
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/lib.pro | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/src/lib.pro b/src/lib.pro
+index b5f8ab6..0731d01 100755
+--- a/src/lib.pro
+++ b/src/lib.pro
+@@ -18,7 +18,7 @@ public_headers += \
+ include(src.pri)
+ 
+ win32: target.path = $${PREFIX}/bin
+-else: target.path = $${PREFIX}/lib
+else: target.path = $${PREFIX}/lib$${LIB_ARCH}
+ INSTALLS += target
+ 
+ headers.files = $$public_headers
+@@ -30,7 +30,7 @@ INSTALLS += headers
+     QMAKE_PKGCONFIG_NAME = qmllive
+     QMAKE_PKGCONFIG_DESCRIPTION = Qt QmlLive Library
+     QMAKE_PKGCONFIG_PREFIX = $$PREFIX
+-    QMAKE_PKGCONFIG_LIBDIR = ${prefix}/lib
+    QMAKE_PKGCONFIG_LIBDIR = ${prefix}/lib$${LIB_ARCH}
+     QMAKE_PKGCONFIG_INCDIR = ${prefix}/include/qmllive
+     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ }
+-- 
+2.24.1
diff --git a/recipes-qt/qmllive/qmllive_git.bb b/recipes-qt/qmllive/qmllive_git.bb
index bc9a3784..8a4a6ce7 100644
--- a/recipes-qt/qmllive/qmllive_git.bb
+++ b/recipes-qt/qmllive/qmllive_git.bb
@@ -7,12 +7,15 @@ DEPENDS = "qtbase qtdeclarative"
 PV = "5.12+git${SRCPV}"
 QT_GIT_PROJECT = "qt-apps"
-SRC_URI = "${QT_GIT}/qmllive.git;branch=dev"
+SRC_URI = "${QT_GIT}/qmllive.git;branch=dev \
+           file://0001-lib.pro-Append-LIB_ARCH-to-lib.patch \
+          "
 SRCREV = "0c7bf141b08aa9e757e91a4a05769257d043eab2"
 S = "${WORKDIR}/git"
 inherit pkgconfig qmake5
+EXTRA_QMAKEVARS_PRE += "LIB_ARCH=${@d.getVar('baselib').replace('lib', '')}"
 EXTRA_QMAKEVARS_POST = "QMAKE_RPATHDIR="
 FILES_${PN}-dev += "${datadir}"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 34349570..0536b6ad 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -22,8 +22,8 @@ require qt5-git.inc
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
 # common for qtbase-native, qtbase-nativesdk and qtbase
-# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-shared
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared
-# 5.13.meta-qt5-shared.1
+# 5.14.meta-qt5-shared.1
 SRC_URI += "\
    file://0001-Add-linux-oe-g-platform.patch \
    file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -46,11 +46,11 @@ SRC_URI += "\
 "
 # common for qtbase-native and nativesdk-qtbase
-# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-native
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native
-# 5.13.meta-qt5-native.1
+# 5.14.meta-qt5-native.1
 SRC_URI += " \
-    file://0018-Always-build-uic-and-qvkgen.patch \
+    file://0019-Always-build-uic-and-qvkgen.patch \
-    file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \
+    file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \
 "
 # CMake's toolchain configuration of nativesdk-qtbase
diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb
index 912f5dc1..5e1f183f 100644
--- a/recipes-qt/qt5/ogl-runtime_git.bb
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -14,6 +14,8 @@ QT_MODULE_BRANCH_EASTL = "master"
 QT_GIT_PROJECT = "qt3dstudio"
 PV = "2.5.0+git${SRCPV}"
+COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc64).*-linux"
 SRC_URI += " \
    ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \
    file://0001-Fix-examples-build-error.patch \
diff --git a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
index d17f60b4..da7561ce 100644
--- a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
+++ b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch
@@ -1,4 +1,4 @@
-From ec7aec2f6c56889c96dc12af46059a7f3d4c3a37 Mon Sep 17 00:00:00 2001
+From 33299724b8719d53b26c9055a76a61c358270110 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 16 Jan 2018 13:26:57 +0000
 Subject: [PATCH] Link with libexecinfo on musl
@@ -6,29 +6,24 @@ Subject: [PATCH] Link with libexecinfo on musl
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- src/plugins/debugger/debugger.pro                         | 1 +
+ src/plugins/debugger/debugger.pro | 1 +
- src/plugins/qmldesigner/designercore/designercore-lib.pri | 2 ++
+ 1 file changed, 1 insertion(+)
- 2 files changed, 3 insertions(+)
-diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
-index f5a34aa0d5..4a1359dd5c 100644
 --- a/src/plugins/debugger/debugger.pro
 +++ b/src/plugins/debugger/debugger.pro
-@@ -141,3 +141,4 @@ include(console/console.pri)
+@@ -139,3 +139,4 @@ include(console/console.pri)
 include(analyzer/analyzer.pri)
 
 include(shared/shared.pri)
 +LIBS  *= -lexecinfo
-diff --git a/src/plugins/qmldesigner/designercore/designercore-lib.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri
+--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
-index 935b29728e..31527267fd 100644
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
--- a/src/plugins/qmldesigner/designercore/designercore-lib.pri
+@@ -3,7 +3,7 @@ CONFIG += exceptions
-+++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri
-@@ -2,6 +2,8 @@ include($$PWD/filemanager/filemanager.pri)
 
- QT += network
+ INCLUDEPATH += $$PWD
+ 
+-unix:!openbsd:!osx: LIBS += -lrt # posix shared memory
+unix:!openbsd:!osx: LIBS += -lexecinfo -lrt # posix shared memory
+ 
+ include(../../qtcreatorplugin.pri)
 
-+LIBS *= -lexecinfo
-+
- DEFINES += TEST_EXPORTS
- DEFINES += DESIGNER_CORE_LIBRARY
- INCLUDEPATH += $$PWD \
diff --git a/recipes-qt/qt5/qt5-creator/0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch b/recipes-qt/qt5/qt5-creator/0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch
index 1bc3632d..7338f02b 100644
--- a/recipes-qt/qt5/qt5-creator/0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch
+++ b/recipes-qt/qt5/qt5-creator/0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch
@@ -18,19 +18,36 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 src/plugins/clangformat/clangformatutils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
-index 09a3150c89..7d8a95ae18 100644
 --- a/src/plugins/clangformat/clangformatutils.cpp
 +++ b/src/plugins/clangformat/clangformatutils.cpp
-@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcStyle()
+@@ -57,10 +57,18 @@ static clang::format::FormatStyle qtcSty
+     style.AlignOperands = true;
+     style.AlignTrailingComments = true;
+     style.AllowAllParametersOfDeclarationOnNextLine = true;
+#if Q_CC_CLANG < 1000
     style.AllowShortBlocksOnASingleLine = false;
+#else
+    style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never;
+#endif
     style.AllowShortCaseLabelsOnASingleLine = false;
     style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
-    style.AllowShortIfStatementsOnASingleLine = false;
+#if Q_CC_CLANG < 900
+     style.AllowShortIfStatementsOnASingleLine = false;
+#else
 +    style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never;
+#endif
     style.AllowShortLoopsOnASingleLine = false;
     style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None;
     style.AlwaysBreakBeforeMultilineStrings = false;
-- 
+@@ -68,7 +76,11 @@ static clang::format::FormatStyle qtcSty
-2.23.0
+     style.BinPackArguments = false;
+     style.BinPackParameters = false;
+     style.BraceWrapping.AfterClass = true;
+#if Q_CC_CLANG < 1000
+     style.BraceWrapping.AfterControlStatement = false;
+#else
+    style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Never;
+#endif
+     style.BraceWrapping.AfterEnum = false;
+     style.BraceWrapping.AfterFunction = true;
+     style.BraceWrapping.AfterNamespace = false;
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb
index a2717ee6..5b723ab4 100644
--- a/recipes-qt/qt5/qt5-creator_git.bb
+++ b/recipes-qt/qt5/qt5-creator_git.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
 inherit qmake5
-DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native"
+DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib"
 DEPENDS_append_toolchain-clang = " clang llvm-common"
 DEPENDS_append_libc-musl = " libexecinfo"
@@ -35,6 +35,9 @@ EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}"
 EXTRANATIVEPATH += "chrpath-native"
+COMPATIBLE_HOST_toolchain-clang_riscv32 = "null"
+COMPATIBLE_HOST_toolchain-clang_riscv64 = "null"
 do_configure_append() {
    # Find native tools
    sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index a88fde1b..1f24291f 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -17,8 +17,8 @@ require qt5-native.inc
 require qt5-git.inc
 # common for qtbase-native, qtbase-nativesdk and qtbase
-# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-shared
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared
-# 5.13.meta-qt5-shared.1
+# 5.14.meta-qt5-shared.1
 SRC_URI += "\
    file://0001-Add-linux-oe-g-platform.patch \
    file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -41,16 +41,16 @@ SRC_URI += "\
 "
 # common for qtbase-native and nativesdk-qtbase
-# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-native
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native
-# 5.13.meta-qt5-native.1
+# 5.14.meta-qt5-native.1
 SRC_URI += " \
-    file://0018-Always-build-uic-and-qvkgen.patch \
+    file://0019-Always-build-uic-and-qvkgen.patch \
-    file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \
+    file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \
 "
 # only for qtbase-native
 SRC_URI += " \
-    file://0020-Bootstrap-without-linkat-feature.patch \
+    file://0021-Bootstrap-without-linkat-feature.patch \
 "
 CLEANBROKEN = "1"
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index 02043ea0..3b71adad 100644
--- 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 4310d415fd53a1c41b838dafc3913b61087bd799 Mon Sep 17 00:00:00 2001
+From 5668523aa073c1ef430b1662c735ead8fd64c83b 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
@@ -31,10 +31,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
 diff --git a/configure b/configure
-index ef7bad1bfc..dcca0f9135 100755
+index 6657870e4b..2f5d9a21ef 100755
 --- a/configure
 +++ b/configure
-@@ -712,7 +712,7 @@ fi
+@@ -711,7 +711,7 @@ fi
 # is where the resulting variable is written to
 setBootstrapVariable()
 {
@@ -89,10 +89,10 @@ index 3a71376029..dd6020f1fe 100644
     # run qmlimportscanner
     qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
 diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 1903e509c8..c093dd4592 100644
+index 661b7dd961..3bc73ab0c6 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
+@@ -76,7 +76,7 @@ defineTest(qtHaveModule) {
 defineTest(qtPrepareTool) {
     cmd = $$eval(QT_TOOL.$${2}.binary)
     isEmpty(cmd) {
diff --git a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
index abef9c2e..1a5adcaf 100644
--- a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
+++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
@@ -1,4 +1,4 @@
-From c15b17e7289f7f17e30972c814e565e4a3c1c629 Mon Sep 17 00:00:00 2001
+From b0e51c74e3f550c2d72ee4e02d1f9c3f5d2e83b5 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 6 Apr 2013 13:15:07 +0200
 Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -19,7 +19,7 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2
 3 files changed, 6 insertions(+), 6 deletions(-)
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index e0652fdcf9..7b8fed8931 100644
+index 9b672327ef..f0820b4f4e 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
 @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 4428efda..6891d8c4 100644
--- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,4 +1,4 @@
-From 4ec7f7cb5b8779e50af4a3fe282e02f225f13ddf Mon Sep 17 00:00:00 2001
+From db95ec35c5e2a1604f82803fc5c09dc82b594175 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 1 file changed, 4 insertions(+), 1 deletion(-)
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index f2ada4ab30..62c6feae17 100644
+index f0f77fe68e..8ef04cb64f 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -174,7 +174,10 @@ void QLibrarySettings::load()
+@@ -183,7 +183,10 @@ void QLibrarySettings::load()
 QSettings *QLibraryInfoPrivate::findConfiguration()
 {
 #ifdef QT_BUILD_QMAKE
diff --git 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
index 6157a52c..25c3a66e 100644
--- 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 b7856b64c4273c25d3f9a0873632595151652c91 Mon Sep 17 00:00:00 2001
+From 3fa9db42f3b34f97929662a461c9a07982505178 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 3778ece180..94bdfd2649 100644
+index 47882afeb6..a50aa0e176 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -844,10 +844,10 @@ defineTest(qtConfOutput_preparePaths) {
+@@ -870,10 +870,10 @@ defineTest(qtConfOutput_preparePaths) {
 
     $${currentConfig}.output.qconfigSource = \
         "/* Installation Info */" \
diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
index 79125fc6..c27f7ac2 100644
--- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
+++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
@@ -1,4 +1,4 @@
-From 50f0c25c0d45928a88a4a2c5a3484e6159f8580a Mon Sep 17 00:00:00 2001
+From 1ca3511433c55755c63dfa0fb78d712c6605b37a Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Mon, 24 Oct 2016 09:45:18 +0300
 Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
-index 81110e9f6d..e6b4eeeb11 100644
+index 6537d98c5d..06d23e3847 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -1604,7 +1604,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
+@@ -1544,7 +1544,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
                     error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
                 return($$result)
             }
diff --git a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
index abc1cf31..03931f5c 100644
--- a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
+++ b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
@@ -1,4 +1,4 @@
-From 11a7d56a5f57a13643bee171f80d9c4d80b2790b Mon Sep 17 00:00:00 2001
+From 37f7cae8d723341b12fe76bca12c4c76d98fb874 Mon Sep 17 00:00:00 2001
 From: Pascal Bach <pascal.bach@siemens.com>
 Date: Wed, 11 May 2016 15:20:41 +0200
 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
 2 files changed, 10 insertions(+)
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index f4a34d6e48..416f1b13bb 100644
+index 364c23e750..670b5c71f2 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
index 29c566fc..1a1d696f 100644
--- a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
+++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
@@ -1,4 +1,4 @@
-From de968b7efc0248052eb96ce430e216a6dfec60d2 Mon Sep 17 00:00:00 2001
+From 2b0adcafba19d87ef452dad156c8fda8ec8396b0 Mon Sep 17 00:00:00 2001
 From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
 Date: Wed, 7 Jun 2017 21:00:49 +0900
 Subject: [PATCH] Delete qlonglong and qulonglong
diff --git 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
index 1c33a51f..fe3e0754 100644
--- 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 a12d09f70178952f5be68110714386a0be00b017 Mon Sep 17 00:00:00 2001
+From 98fbf9fcbe29886dbc84a7e95a9f58a588a8e8ea 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
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 2 files changed, 5 insertions(+), 4 deletions(-)
 diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
-index e2bb7dab2a..683c7bafcd 100644
+index 12c29a6e13..7d31799da6 100644
 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 @@ -35,7 +35,7 @@
@@ -36,7 +36,7 @@ index e2bb7dab2a..683c7bafcd 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 10b09629bc..858fc5fc99 100644
+index 75b9b23259..77b5bf1525 100644
 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 @@ -78,6 +78,7 @@
@@ -47,7 +47,7 @@ index 10b09629bc..858fc5fc99 100644
 #endif
 
 #include "private/qhostinfo_p.h"
-@@ -2151,8 +2152,8 @@ public slots:
+@@ -2177,8 +2178,8 @@ public slots:
 
 #if defined(Q_OS_MAC)
         pthread_yield_np();
diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
index a0120a4a..fd2716ec 100644
--- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
+++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
@@ -1,4 +1,4 @@
-From 69999f5af72d090ec5ddd7003e099af5dfb448ac Mon Sep 17 00:00:00 2001
+From 46b07eaf67735ad21b56c67a61737491c1150760 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 3 Sep 2017 09:11:44 -0700
 Subject: [PATCH] Add OE specific specs for clang compiler
diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
index fec487a6..b9c95c5e 100644
--- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
+++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
@@ -1,4 +1,4 @@
-From 82111f824764051266d0b807ab3c61bf13b1056a Mon Sep 17 00:00:00 2001
+From df0f6f03af2494d7dc73035273e0a7e65780f3d7 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 3 Sep 2017 09:44:48 -0700
 Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T
diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
index d5c23c38..bd835f1e 100644
--- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
+++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
@@ -1,4 +1,4 @@
-From 78d1a6005263f3a7d2dd4ce22f13d3d35b3c6c2f Mon Sep 17 00:00:00 2001
+From fab74db07a1f4f7502d37c4f4c2a04f540dbe6a5 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 3 Sep 2017 10:11:50 -0700
 Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
-index 676c66d..ba05aad 100644
+index 20ed7500b5..90181fd078 100644
 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
 +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
 @@ -46,7 +46,7 @@
diff --git 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
index 1f1ec8bd..c5a2a67f 100644
--- 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,4 +1,4 @@
-From f01d43195be86fb5b06ad042551d65c54e34425a Mon Sep 17 00:00:00 2001
+From 716d70f9ac91725155f7e6c14727ab86fbdf44f4 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
@@ -22,7 +22,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 2 files changed, 2 insertions(+), 2 deletions(-)
 diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
-index df210fe42d..79a3ddf2f8 100644
+index aead581478..8e06a069b4 100644
 --- a/mkspecs/common/clang.conf
 +++ b/mkspecs/common/clang.conf
 @@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT    = .pch
@@ -35,7 +35,7 @@ index df210fe42d..79a3ddf2f8 100644
 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 44b4267207..9756a02014 100644
+index 4d82321cba..0b03ec99a6 100644
 --- a/mkspecs/common/gcc-base.conf
 +++ b/mkspecs/common/gcc-base.conf
 @@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG         += -g
diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
index 34e41a18..6797e903 100644
--- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
+++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
@@ -1,4 +1,4 @@
-From 7804eb38b11b3a03217a6505d4b64c335d5a1d0d Mon Sep 17 00:00:00 2001
+From 63cf72b8519dd58a5fb6eeeef67b19842806cddc Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Tue, 23 Oct 2018 09:54:57 +0300
 Subject: [PATCH] Disable ltcg for host_build
@@ -15,7 +15,7 @@ Upstream-Status: Inappropriate [embedded specific]
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf
-index a94f6d0eeb..ccab725843 100644
+index d81f340edd..dc1d196710 100644
 --- a/mkspecs/features/ltcg.prf
 +++ b/mkspecs/features/ltcg.prf
 @@ -1,6 +1,6 @@
diff --git a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
index 8f0568ad..91f12f64 100644
--- a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
+++ b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
@@ -1,4 +1,4 @@
-From e8d9ebf65245a7ca17bdc3f1ed313c60736e7c9b Mon Sep 17 00:00:00 2001
+From 5630158766df351317ead6059ca7039cd125ab27 Mon Sep 17 00:00:00 2001
 From: Max Krummenacher <max.krummenacher@toradex.com>
 Date: Sat, 27 Oct 2018 12:29:31 +0000
 Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to
diff --git a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch
index 78b13ddd..2906e763 100644
--- a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch
+++ b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch
@@ -1,4 +1,4 @@
-From 1dbee5ad3c0bc44c4c208ac27448535ef412a0ea Mon Sep 17 00:00:00 2001
+From a1508aff41a526b900f958831a1196f2655c57e9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 6 Dec 2018 11:47:52 -0800
 Subject: [PATCH] corelib: Include sys/types.h for uint32_t
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 1 insertion(+)
 diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h
-index 4a225b2599..4414865c71 100644
+index 86e7997680..73bcd370c2 100644
 --- a/src/corelib/global/qnumeric_p.h
 +++ b/src/corelib/global/qnumeric_p.h
 @@ -55,6 +55,7 @@
diff --git a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
index d30f335f..eff1e0b2 100644
--- a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
+++ b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
@@ -1,4 +1,4 @@
-From 6ba1d79754bea482b2ac5ae2bb3e60681d435d37 Mon Sep 17 00:00:00 2001
+From e983e9e5451d6961a11206360aeae599f090f971 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 6 Dec 2018 15:06:20 -0800
 Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux
diff --git a/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch
index 8411b83d..ebaa7b65 100644
--- a/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch
+++ b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch
@@ -1,4 +1,4 @@
-From b938d809624660a2998ea7f844aba715e40acfc6 Mon Sep 17 00:00:00 2001
+From a0f5ac48354dd86aaa53c07e08e30098c62f5097 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 5 Oct 2019 16:21:08 -0700
 Subject: [PATCH] qfloat16: check for __ARM_FP & 2
@@ -20,10 +20,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp
-index 87ff796368..37dec371a6 100644
+index 6c21b7de5a..98d34a96a5 100644
 --- a/src/corelib/global/qfloat16.cpp
 +++ b/src/corelib/global/qfloat16.cpp
-@@ -148,7 +148,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype
+@@ -205,7 +205,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype
 #undef f16cextern
 }
 
diff --git a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
index 0d3b48ff..7a5c7754 100644
--- a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
+++ b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
@@ -1,4 +1,4 @@
-From c200c1704501e5a74f72dedc3b3b76567d679e0d Mon Sep 17 00:00:00 2001
+From b83804eb1f9087800295cf40916577f932673dc8 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
@@ -8,7 +8,7 @@ on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with
 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 +++++++++-
@@ -44,7 +44,7 @@ index 3555763b89..e7dc57c027 100644
     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
+index c51db59e1f..1f3726e291 100644
 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
 +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
 @@ -58,6 +58,11 @@
@@ -59,7 +59,7 @@ index 78728ef4ce..1d65f9b9f7 100644
 #include <math.h>
 
 #if QT_CONFIG(mtdev)
-@@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
+@@ -576,7 +581,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
 
         // update timestamps
         m_lastTimeStamp = m_timeStamp;
diff --git a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch
index 2ebab22b..86dfac2c 100644
--- a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch
+++ b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch
@@ -1,4 +1,4 @@
-From 86effd1f524ebe13d3c288e5ccd1bd477508c0d0 Mon Sep 17 00:00:00 2001
+From eff8ae2d5748626dfd173fa6cb5860bb72ffeafa Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 16 Nov 2013 00:32:30 +0100
 Subject: [PATCH] Always build uic and qvkgen
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/src.pro b/src/src.pro
-index ce3db6d783..2bd15f57d9 100644
+index 8ff3ec4c1f..7a26fd3596 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -231,7 +231,7 @@ qtConfig(gui) {
+@@ -235,7 +235,7 @@ qtConfig(gui) {
         }
     }
 }
diff --git a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch
index 2393673f..bde4f76c 100644
--- a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
+++ b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch
@@ -1,4 +1,4 @@
-From 0ee2fc2de566efc5ad579dec693534105199f33d Mon Sep 17 00:00:00 2001
+From 37ea0b0c40f541cf9741c064e97ec9e9327ba7a1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 14 Apr 2019 13:27:58 +0200
 Subject: [PATCH] Avoid renameeat2 for native(sdk) builds
@@ -24,7 +24,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 2 files changed, 2 insertions(+), 12 deletions(-)
 diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
-index 10458e41d7..8cfa40e461 100644
+index e6ad80525a..283ce1ce26 100644
 --- a/src/corelib/global/qconfig-bootstrapped.h
 +++ b/src/corelib/global/qconfig-bootstrapped.h
 @@ -104,7 +104,7 @@
@@ -46,7 +46,7 @@ index 10458e41d7..8cfa40e461 100644
 # define QT_FEATURE_statx -1
 #endif
 diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
-index c3abec8..6229c61 100644
+index c3abec8989..6229c611b8 100644
 --- a/src/corelib/io/qfilesystemengine_unix.cpp
 +++ b/src/corelib/io/qfilesystemengine_unix.cpp
 @@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
diff --git a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch
index a12ba359..70f25ca2 100644
--- a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch
+++ b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch
@@ -1,4 +1,4 @@
-From 9d40b6e665f67f5096eba41bea13492d3eda056c Mon Sep 17 00:00:00 2001
+From 7596905dbe3ff36a129b5793966da30579d877f4 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 24 Nov 2017 15:16:31 +0200
 Subject: [PATCH] Bootstrap without linkat feature
@@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [OE specific]
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
-index 8cfa40e461..f2fba9ebd8 100644
+index 283ce1ce26..dfcbb15a6b 100644
 --- a/src/corelib/global/qconfig-bootstrapped.h
 +++ b/src/corelib/global/qconfig-bootstrapped.h
-@@ -91,7 +91,7 @@
+@@ -95,7 +95,7 @@
 #define QT_FEATURE_itemmodel -1
 #define QT_FEATURE_library -1
 #ifdef __linux__
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 650fdeef..e5015495 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = " \
 "
 # common for qtbase-native, qtbase-nativesdk and qtbase
-# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-shared
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared
-# 5.13.meta-qt5-shared.1
+# 5.14.meta-qt5-shared.1
 SRC_URI += "\
    file://0001-Add-linux-oe-g-platform.patch \
    file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 037c0991..49e25273 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -12,10 +12,9 @@ LIC_FILES_CHKSUM = " \
    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
-SRC_URI += "\
+SRC_URI += "file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \
-    file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \
+            file://0001-Use-python3-explicitly.patch \
-    file://0001-Use-python3-explicitly.patch \
+           "
-"
 DEPENDS += "qtbase"
diff --git a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch
new file mode 100644
index 00000000..55c6e22a
--- /dev/null
+++ b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch
@@ -0,0 +1,28 @@
+From 623675e07231f62cdc7600dca5897a9fc70e0467 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 14 Dec 2019 18:36:49 -0800
+Subject: [PATCH] src.pro: Add option noqdoc to disable qdoc builds
+it needs clang on host, so lets separate it out
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/src.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/src.pro b/src/src.pro
+index 5c256ea3..196c34c7 100644
+--- a/src/src.pro
+++ b/src/src.pro
+@@ -25,7 +25,7 @@ qtConfig(library) {
+ 
+ include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+ QT_FOR_CONFIG += qdoc-private
+-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
+qtConfig(qdoc): qtConfig(thread):!contains(CONFIG, noqdoc): SUBDIRS += qdoc
+ 
+ !android|android_app: SUBDIRS += qtpaths
+ 
+-- 
+2.24.1
diff --git a/recipes-qt/qt5/qttools/run-ptest b/recipes-qt/qt5/qttools/run-ptest
deleted file mode 100644
index ae671a72..00000000
--- a/recipes-qt/qt5/qttools/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-./tst_qtdiag
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 6252ae4e..16ccb78e 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -11,13 +11,13 @@ LIC_FILES_CHKSUM = " \
    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
-DEPENDS += "qtbase qtdeclarative qtxmlpatterns chrpath-replacement-native"
+DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
-EXTRANATIVEPATH += "chrpath-native"
 # Patches from https://github.com/meta-qt5/qttools/commits/b5.13
 # 5.13.meta-qt5.1
 SRC_URI += " \
    file://0001-add-noqtwebkit-configuration.patch \
    file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
+    file://0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch \
 "
 FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks"
@@ -29,10 +29,19 @@ PACKAGECONFIG_append_toolchain-clang = " clang"
 PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
 PACKAGECONFIG[clang] = ",,clang"
+COMPATIBLE_HOST_toolchain-clang_riscv32 = "null"
+COMPATIBLE_HOST_toolchain-clang_riscv64 = "null"
 export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config"
+TOOLSTOBUILD += "linguist/lconvert linguist/lrelease linguist/lupdate pixeltool qtdiag qtpaths qtplugininfo"
+TOOLSTOBUILD += "${@bb.utils.contains('PACKAGECONFIG', 'clang', 'qdoc', '', d)}"
+TOOLSFORTARGET = "pixeltool qtdiag qtpaths qtplugininfo"
+TOOLSFORHOST = "linguist ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'qdoc', '', d)}"
 EXTRA_QMAKEVARS_PRE += " \
    ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath', 'CONFIG+=noqdoc', d)} \
 "
 EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang"
 EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang"
@@ -44,6 +53,3 @@ SRCREV = "4dcc7a3d10a223ddd111eaaac6665609add7c46f"
 BBCLASSEXTEND = "native nativesdk"
-do_install_append_toolchain-clang() {
-    chrpath --delete ${D}${bindir}/qdoc
-}
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index f54f44e9..5b287dfa 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -10,7 +10,7 @@ DEPENDS += "qtbase qttools-native"
 do_install_append() {
    # remove qtquick1 translations - qtquick1 is gone
-    for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qmlviewer_*.qm -o -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do
+    for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do
        rm $transfile
    done
 }
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index 7bda76a2..6b3f6ba6 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
-From f3f2b6b42d546280a17169ea340d8bef82496516 Mon Sep 17 00:00:00 2001
+From cdadaf40267c81ff730e90798cf486b35bb20758 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 15 Mar 2017 13:53:28 +0200
 Subject: [PATCH] Force host toolchain configuration
@@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
 3 files changed, 10 insertions(+), 10 deletions(-)
 diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
-index 998aedc..b04db36 100644
+index ee08f81b..297a6862 100644
 --- a/src/buildtools/config/linux.pri
 +++ b/src/buildtools/config/linux.pri
 @@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") {
@@ -32,7 +32,7 @@ index 998aedc..b04db36 100644
     # Don't bother trying to use system libraries in this case
     gn_args += use_glib=false
 diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
-index dd0d3e3..6312c86 100644
+index dd0d3e32..6312c867 100644
 --- a/src/buildtools/configure_host.pro
 +++ b/src/buildtools/configure_host.pro
 @@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -71,7 +71,7 @@ index dd0d3e3..6312c86 100644
 "  nm = \"$$which(nm)\" " \
 "  toolchain_args = { " \
 diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
-index 033202e..a8ca656 100644
+index 033202e6..a8ca6567 100644
 --- a/src/buildtools/gn.pro
 +++ b/src/buildtools/gn.pro
 @@ -19,8 +19,8 @@ build_pass|!debug_and_release {
diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
index ffdf0d05..63a800e4 100644
--- a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
@@ -1,4 +1,4 @@
-From 0402c28580b96c8c8953ea85144f4874f8768622 Mon Sep 17 00:00:00 2001
+From 312f6955af1dc6ea61bbd48bece794c1257822fa Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Tue, 12 Dec 2017 16:06:14 +0200
 Subject: [PATCH] musl: don't use pvalloc as it's not available on musl
diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
index c56c68f1..5c8e1052 100644
--- 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 6b5a763cd223ab14bb840738b3871a79d1fb69ea Mon Sep 17 00:00:00 2001
+From 8c66e08c65963cd2eeabe84e89445dbe557c23ae 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,7 +10,7 @@ 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 b220af4a..ff54e5d7 100644
+index 4b9268e1..be04b160 100644
 --- a/src/core/core_module.pro
 +++ b/src/core/core_module.pro
 @@ -58,7 +58,7 @@ linux {
diff --git 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
new file mode 100644
index 00000000..5c3eafb5
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
@@ -0,0 +1,26 @@
+From 71d55292cdd72dcf1ed5eb4ba7299433a35a4bb0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 12 Nov 2019 19:53:59 -0800
+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(-)
+diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
+index 5bdd808d..19540787 100644
+--- a/src/buildtools/config/support.pri
+++ b/src/buildtools/config/support.pri
+@@ -89,11 +89,6 @@ defineTest(qtwebengine_checkErrorForLinux) {
+         return(false)
+     }
+ 
+-    !qtConfig(webengine-system-glibc) {
+-        qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine 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)
diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch
deleted file mode 100644
index 0b312809..00000000
--- a/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f8e556db0c49f31881ebefdb2ab28d2b22fccd5c Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Thu, 15 Aug 2019 07:52:53 +0300
-Subject: [PATCH] musl: allow build without glibc
-Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
---
- src/buildtools/config/support.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
-index 5bdd808..eda498f 100644
--- a/src/buildtools/config/support.pri
-+++ b/src/buildtools/config/support.pri
-@@ -89,7 +89,7 @@ defineTest(qtwebengine_checkErrorForLinux) {
-         return(false)
-     }
- 
-    !qtConfig(webengine-system-glibc) {
-+    false:!qtConfig(webengine-system-glibc) {
-         qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.")
-         return(false)
-     }
diff --git 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
index 1bcea021..ff2cf2ed 100644
--- 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 97bbc1219c360f3a27aa9b8bf21dd4b755c979b6 Mon Sep 17 00:00:00 2001
+From 8dc7d83d58f6f036d021ed27dd05322b654e21bf 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
index ed7f78f6..e2e86212 100644
--- 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 90881e8b608658e766bcf96fc62d97b39e005f01 Mon Sep 17 00:00:00 2001
+From dcc7962a9e9eb8fc10728df0b72e91794d1ee9d9 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,7 +17,7 @@ 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 9276f56..622cc1f 100644
+index 9276f5627af..622cc1fbf7e 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 {
diff --git 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
index 278a9b0c..55f61d03 100644
--- 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 156dd87c5579c355a8668c6b78c3853f2d288846 Mon Sep 17 00:00:00 2001
+From e44d59aff5c23049ed765d872b167c27f9d2be23 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,7 +10,7 @@ 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 17f486447fe..06c93e5b3cf 100644
+index be485fd89b9..7179df05451 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
 @@ -773,8 +773,6 @@ config("compiler_cpu_abi") {
diff --git 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
index bb628fd2..e5c1dcbd 100644
--- 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 ed03bdbaaa07414a310414e9fa7624acf6241b19 Mon Sep 17 00:00:00 2001
+From fc3765e4f2f8cff17a13736085a402425696e6e7 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,7 +15,7 @@ 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 29dda54..6870dbb 100644
+index 29dda54ac20..6870dbb9f08 100644
 --- a/chromium/third_party/zlib/BUILD.gn
 +++ b/chromium/third_party/zlib/BUILD.gn
 @@ -78,8 +78,11 @@ if (use_arm_neon_optimizations) {
diff --git 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
index 12128d3c..c9df775d 100644
--- 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,4 +1,4 @@
-From 85a1cd44983263b59942d83bd7626ed4700b29fe Mon Sep 17 00:00:00 2001
+From 998a4037e9c057c9735d8b0df57c2eca5b452d0b 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
@@ -17,7 +17,7 @@ Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
 1 file changed, 9 deletions(-)
 diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
-index 06c93e5b3cf..8ba0f8a3109 100644
+index 7179df05451..884c9714bbb 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
 @@ -774,15 +774,6 @@ config("compiler_cpu_abi") {
diff --git 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
index 4dafd779..6a659ae9 100644
--- 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 89338139ee40ab93065a915dcde9af79ba52b381 Mon Sep 17 00:00:00 2001
+From 2ce7742c9dfde9ccbf2ede0db6359beb18c49189 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
@@ -24,11 +24,11 @@ moment.
 Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 ---
- .../third_party/skia/src/opts/SkRasterPipeline_opts.h   | 17 ++---------------
+ .../skia/src/opts/SkRasterPipeline_opts.h       | 17 ++---------------
 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 b59506d..b8f22c9 100644
+index b59506dcd6d..b8f22c948c0 100644
 --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
 +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
 @@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) {
diff --git 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
index 6d9f73e4..aeb496bd 100644
--- 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 5408581e2ac5225ba2c6d6b0d88636751930577d Mon Sep 17 00:00:00 2001
+From a0bd9300aa9c405216f504d602c7dd8d5b35eb21 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 c38d7fdfac9..575e0001ca1 100644
+index c1d6d26acc6..6de81b751dd 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;
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-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
index ac16068c..0bd4a451 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0021-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,7 +1,7 @@
-From 6ae9112ffea9a5b7d41a06c3d33e55e4f32d8b5a Mon Sep 17 00:00:00 2001
+From b0d3cfec7837dcf818c08454a16eb44d78337a9f 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] Fix build on 32bit arches with 64bit time_t
+Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
 time element is deprecated on new input_event structure in kernel's
 input.h [1]
@@ -9,6 +9,7 @@ input.h [1]
 [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
 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 +++---
@@ -16,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 3 files changed, 10 insertions(+), 5 deletions(-)
 diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
-index 684514ff011..e2f2ae0b633 100644
+index 5684f4121be..10f6357e6b5 100644
 --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
 +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
-@@ -168,8 +168,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback(
+@@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback(
 base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent(
     const input_event& event) {
   base::TimeTicks timestamp =
@@ -65,6 +66,3 @@ index ccd3a499a38..5a2da89d09a 100644
 namespace ui {
 
 class EventDeviceInfo;
-- 
-2.24.0
diff --git 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
new file mode 100644
index 00000000..1f4a7c14
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
@@ -0,0 +1,48 @@
+From ef41260060293cf53c279b675c470341fd635a4e 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
+Include ctsdint for uintXX_t
+Fixes
+In file included from ../../../../git/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.cc:10:
+../../../../git/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h:34:3: error: 'size_t' does not name a type
+   34 |   size_t stability_counter_;
+      |   ^~~~~~
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+ccc
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h   | 1 +
+ .../third_party/webrtc/modules/video_coding/decoding_state.h     | 1 +
+ 2 files changed, 2 insertions(+)
+diff --git a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
+index 22528c94892..69e624e8b19 100644
+--- a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
+++ b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
+@@ -12,6 +12,7 @@
+ #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
+ 
+ #include <array>
+#include <cstddef>
+ 
+ namespace webrtc {
+ 
+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
+--- 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 @@
+ #include <map>
+ #include <set>
+ #include <vector>
+#include <cstdint>
+ 
+ namespace webrtc {
+ 
diff --git 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
new file mode 100644
index 00000000..352e553b
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
@@ -0,0 +1,554 @@
+From d47414a793f9c1bf1eb01fd3a723b2bc871037de 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
+Fixes
+error: invalid application of 'sizeof' to an incomplete type 'cc::ListContainerHelper::CharAllocator'
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ chromium/cc/base/list_container_helper.cc | 251 ---------------------
+ chromium/cc/base/list_container_helper.h  | 255 ++++++++++++++++++++++
+ 2 files changed, 255 insertions(+), 251 deletions(-)
+diff --git a/chromium/cc/base/list_container_helper.cc b/chromium/cc/base/list_container_helper.cc
+index 3a4c0b6a2f9..89df57a7b8e 100644
+--- a/chromium/cc/base/list_container_helper.cc
+++ b/chromium/cc/base/list_container_helper.cc
+@@ -12,259 +12,8 @@
+ #include "base/logging.h"
+ #include "base/memory/aligned_memory.h"
+ 
+-namespace {
+-const size_t kDefaultNumElementTypesToReserve = 32;
+-}  // namespace
+-
+ namespace cc {
+ 
+-// CharAllocator
+-////////////////////////////////////////////////////
+-// This class deals only with char* and void*. It does allocation and passing
+-// out raw pointers, as well as memory deallocation when being destroyed.
+-class ListContainerHelper::CharAllocator {
+- public:
+-  // CharAllocator::InnerList
+-  /////////////////////////////////////////////
+-  // This class holds the raw memory chunk, as well as information about its
+-  // size and availability.
+-  struct InnerList {
+-    InnerList(const InnerList&) = delete;
+-    InnerList& operator=(const InnerList&) = delete;
+-
+-    std::unique_ptr<char[], base::AlignedFreeDeleter> data;
+-    // The number of elements in total the memory can hold. The difference
+-    // between capacity and size is the how many more elements this list can
+-    // hold.
+-    size_t capacity;
+-    // The number of elements have been put into this list.
+-    size_t size;
+-    // The size of each element is in bytes. This is used to move from between
+-    // elements' memory locations.
+-    size_t step;
+-
+-    InnerList() : capacity(0), size(0), step(0) {}
+-
+-    void Erase(char* position) {
+-      // Confident that destructor is called by caller of this function. Since
+-      // CharAllocator does not handle construction after
+-      // allocation, it doesn't handle desctrution before deallocation.
+-      DCHECK_LE(position, LastElement());
+-      DCHECK_GE(position, Begin());
+-      char* start = position + step;
+-      std::copy(start, End(), position);
+-
+-      --size;
+-      // Decrease capacity to avoid creating not full not last InnerList.
+-      --capacity;
+-    }
+-
+-    void InsertBefore(size_t alignment, char** position, size_t count) {
+-      DCHECK_LE(*position, LastElement() + step);
+-      DCHECK_GE(*position, Begin());
+-
+-      // Adjust the size and capacity
+-      size_t old_size = size;
+-      size += count;
+-      capacity = size;
+-
+-      // Allocate the new data and update the iterator's pointer.
+-      std::unique_ptr<char[], base::AlignedFreeDeleter> new_data(
+-          static_cast<char*>(base::AlignedAlloc(size * step, alignment)));
+-      size_t position_offset = *position - Begin();
+-      *position = new_data.get() + position_offset;
+-
+-      // Copy the data before the inserted segment
+-      memcpy(new_data.get(), data.get(), position_offset);
+-      // Copy the data after the inserted segment.
+-      memcpy(new_data.get() + position_offset + count * step,
+-             data.get() + position_offset, old_size * step - position_offset);
+-      data = std::move(new_data);
+-    }
+-
+-    bool IsEmpty() const { return !size; }
+-    bool IsFull() { return capacity == size; }
+-    size_t NumElementsAvailable() const { return capacity - size; }
+-
+-    void* AddElement() {
+-      DCHECK_LT(size, capacity);
+-      ++size;
+-      return LastElement();
+-    }
+-
+-    void RemoveLast() {
+-      DCHECK(!IsEmpty());
+-      --size;
+-    }
+-
+-    char* Begin() const { return data.get(); }
+-    char* End() const { return data.get() + size * step; }
+-    char* LastElement() const { return data.get() + (size - 1) * step; }
+-    char* ElementAt(size_t index) const { return data.get() + index * step; }
+-  };
+-
+-  CharAllocator(size_t alignment, size_t element_size, size_t element_count)
+-      // base::AlignedAlloc does not accept alignment less than sizeof(void*).
+-      : alignment_(std::max(sizeof(void*), alignment)),
+-        element_size_(element_size),
+-        size_(0),
+-        last_list_index_(0),
+-        last_list_(nullptr) {
+-    // If this fails, then alignment of elements after the first could be wrong,
+-    // and we need to pad sizes to fix that.
+-    DCHECK_EQ(element_size % alignment, 0u);
+-    AllocateNewList(element_count > 0 ? element_count
+-                                      : kDefaultNumElementTypesToReserve);
+-    last_list_ = storage_[last_list_index_].get();
+-  }
+-
+-  CharAllocator(const CharAllocator&) = delete;
+-  ~CharAllocator() = default;
+-
+-  CharAllocator& operator=(const CharAllocator&) = delete;
+-
+-  void* Allocate() {
+-    if (last_list_->IsFull()) {
+-      // Only allocate a new list if there isn't a spare one still there from
+-      // previous usage.
+-      if (last_list_index_ + 1 >= storage_.size())
+-        AllocateNewList(last_list_->capacity * 2);
+-
+-      ++last_list_index_;
+-      last_list_ = storage_[last_list_index_].get();
+-    }
+-
+-    ++size_;
+-    return last_list_->AddElement();
+-  }
+-
+-  size_t alignment() const { return alignment_; }
+-  size_t element_size() const { return element_size_; }
+-  size_t list_count() const { return storage_.size(); }
+-  size_t size() const { return size_; }
+-  bool IsEmpty() const { return size() == 0; }
+-
+-  size_t Capacity() const {
+-    size_t capacity_sum = 0;
+-    for (const auto& inner_list : storage_)
+-      capacity_sum += inner_list->capacity;
+-    return capacity_sum;
+-  }
+-
+-  void Clear() {
+-    // Remove all except for the first InnerList.
+-    DCHECK(!storage_.empty());
+-    storage_.erase(storage_.begin() + 1, storage_.end());
+-    last_list_index_ = 0;
+-    last_list_ = storage_[0].get();
+-    last_list_->size = 0;
+-    size_ = 0;
+-  }
+-
+-  void RemoveLast() {
+-    DCHECK(!IsEmpty());
+-    last_list_->RemoveLast();
+-    if (last_list_->IsEmpty() && last_list_index_ > 0) {
+-      --last_list_index_;
+-      last_list_ = storage_[last_list_index_].get();
+-
+-      // If there are now two empty inner lists, free one of them.
+-      if (last_list_index_ + 2 < storage_.size())
+-        storage_.pop_back();
+-    }
+-    --size_;
+-  }
+-
+-  void Erase(PositionInCharAllocator* position) {
+-    DCHECK_EQ(this, position->ptr_to_container);
+-
+-    // Update |position| to point to the element after the erased element.
+-    InnerList* list = storage_[position->vector_index].get();
+-    char* item_iterator = position->item_iterator;
+-    if (item_iterator == list->LastElement())
+-      position->Increment();
+-
+-    list->Erase(item_iterator);
+-    // TODO(weiliangc): Free the InnerList if it is empty.
+-    --size_;
+-  }
+-
+-  void InsertBefore(ListContainerHelper::Iterator* position, size_t count) {
+-    if (!count)
+-      return;
+-
+-    // If |position| is End(), then append |count| elements at the end. This
+-    // will happen to not invalidate any iterators or memory.
+-    if (!position->item_iterator) {
+-      // Set |position| to be the first inserted element.
+-      Allocate();
+-      position->vector_index = storage_.size() - 1;
+-      position->item_iterator = storage_[position->vector_index]->LastElement();
+-      // Allocate the rest.
+-      for (size_t i = 1; i < count; ++i)
+-        Allocate();
+-    } else {
+-      storage_[position->vector_index]->InsertBefore(
+-          alignment_, &position->item_iterator, count);
+-      size_ += count;
+-    }
+-  }
+-
+-  InnerList* InnerListById(size_t id) const {
+-    DCHECK_LT(id, storage_.size());
+-    return storage_[id].get();
+-  }
+-
+-  size_t FirstInnerListId() const {
+-    // |size_| > 0 means that at least one vector in |storage_| will be
+-    // non-empty.
+-    DCHECK_GT(size_, 0u);
+-    size_t id = 0;
+-    while (storage_[id]->size == 0)
+-      ++id;
+-    return id;
+-  }
+-
+-  size_t LastInnerListId() const {
+-    // |size_| > 0 means that at least one vector in |storage_| will be
+-    // non-empty.
+-    DCHECK_GT(size_, 0u);
+-    size_t id = storage_.size() - 1;
+-    while (storage_[id]->size == 0)
+-      --id;
+-    return id;
+-  }
+-
+-  size_t NumAvailableElementsInLastList() const {
+-    return last_list_->NumElementsAvailable();
+-  }
+-
+- private:
+-  void AllocateNewList(size_t list_size) {
+-    std::unique_ptr<InnerList> new_list(new InnerList);
+-    new_list->capacity = list_size;
+-    new_list->size = 0;
+-    new_list->step = element_size_;
+-    new_list->data.reset(static_cast<char*>(
+-        base::AlignedAlloc(list_size * element_size_, alignment_)));
+-    storage_.push_back(std::move(new_list));
+-  }
+-
+-  std::vector<std::unique_ptr<InnerList>> storage_;
+-  const size_t alignment_;
+-  const size_t element_size_;
+-
+-  // The number of elements in the list.
+-  size_t size_;
+-
+-  // The index of the last list to have had elements added to it, or the only
+-  // list if the container has not had elements added since being cleared.
+-  size_t last_list_index_;
+-
+-  // This is equivalent to |storage_[last_list_index_]|.
+-  InnerList* last_list_;
+-};
+-
+ // PositionInCharAllocator
+ //////////////////////////////////////////////////////
+ ListContainerHelper::PositionInCharAllocator::PositionInCharAllocator(
+diff --git a/chromium/cc/base/list_container_helper.h b/chromium/cc/base/list_container_helper.h
+index 31658bc8486..9e65013cbdb 100644
+--- a/chromium/cc/base/list_container_helper.h
+++ b/chromium/cc/base/list_container_helper.h
+@@ -8,9 +8,17 @@
+ #include <stddef.h>
+ 
+ #include <memory>
+#include <algorithm>
+#include <vector>
+ 
+#include "base/logging.h"
+#include "base/memory/aligned_memory.h"
+ #include "cc/base/base_export.h"
+ 
+namespace {
+const size_t kDefaultNumElementTypesToReserve = 32;
+}  // namespace
+
+ namespace cc {
+ 
+ // Helper class for ListContainer non-templated logic. All methods are private,
+@@ -174,6 +182,253 @@ class CC_BASE_EXPORT ListContainerHelper final {
+   std::unique_ptr<CharAllocator> data_;
+ };
+ 
+// CharAllocator
+////////////////////////////////////////////////////
+// This class deals only with char* and void*. It does allocation and passing
+// out raw pointers, as well as memory deallocation when being destroyed.
+class ListContainerHelper::CharAllocator {
+ public:
+  // CharAllocator::InnerList
+  /////////////////////////////////////////////
+  // This class holds the raw memory chunk, as well as information about its
+  // size and availability.
+  struct InnerList {
+    InnerList(const InnerList&) = delete;
+    InnerList& operator=(const InnerList&) = delete;
+
+    std::unique_ptr<char[], base::AlignedFreeDeleter> data;
+    // The number of elements in total the memory can hold. The difference
+    // between capacity and size is the how many more elements this list can
+    // hold.
+    size_t capacity;
+    // The number of elements have been put into this list.
+    size_t size;
+    // The size of each element is in bytes. This is used to move from between
+    // elements' memory locations.
+    size_t step;
+
+    InnerList() : capacity(0), size(0), step(0) {}
+
+    void Erase(char* position) {
+      // Confident that destructor is called by caller of this function. Since
+      // CharAllocator does not handle construction after
+      // allocation, it doesn't handle desctrution before deallocation.
+      DCHECK_LE(position, LastElement());
+      DCHECK_GE(position, Begin());
+      char* start = position + step;
+      std::copy(start, End(), position);
+
+      --size;
+      // Decrease capacity to avoid creating not full not last InnerList.
+      --capacity;
+    }
+
+    void InsertBefore(size_t alignment, char** position, size_t count) {
+      DCHECK_LE(*position, LastElement() + step);
+      DCHECK_GE(*position, Begin());
+
+      // Adjust the size and capacity
+      size_t old_size = size;
+      size += count;
+      capacity = size;
+
+      // Allocate the new data and update the iterator's pointer.
+      std::unique_ptr<char[], base::AlignedFreeDeleter> new_data(
+          static_cast<char*>(base::AlignedAlloc(size * step, alignment)));
+      size_t position_offset = *position - Begin();
+      *position = new_data.get() + position_offset;
+
+      // Copy the data before the inserted segment
+      memcpy(new_data.get(), data.get(), position_offset);
+      // Copy the data after the inserted segment.
+      memcpy(new_data.get() + position_offset + count * step,
+             data.get() + position_offset, old_size * step - position_offset);
+      data = std::move(new_data);
+    }
+
+    bool IsEmpty() const { return !size; }
+    bool IsFull() { return capacity == size; }
+    size_t NumElementsAvailable() const { return capacity - size; }
+
+    void* AddElement() {
+      DCHECK_LT(size, capacity);
+      ++size;
+      return LastElement();
+    }
+
+    void RemoveLast() {
+      DCHECK(!IsEmpty());
+      --size;
+    }
+
+    char* Begin() const { return data.get(); }
+    char* End() const { return data.get() + size * step; }
+    char* LastElement() const { return data.get() + (size - 1) * step; }
+    char* ElementAt(size_t index) const { return data.get() + index * step; }
+  };
+
+  CharAllocator(size_t alignment, size_t element_size, size_t element_count)
+      // base::AlignedAlloc does not accept alignment less than sizeof(void*).
+      : alignment_(std::max(sizeof(void*), alignment)),
+        element_size_(element_size),
+        size_(0),
+        last_list_index_(0),
+        last_list_(nullptr) {
+    // If this fails, then alignment of elements after the first could be wrong,
+    // and we need to pad sizes to fix that.
+    DCHECK_EQ(element_size % alignment, 0u);
+    AllocateNewList(element_count > 0 ? element_count
+                                      : kDefaultNumElementTypesToReserve);
+    last_list_ = storage_[last_list_index_].get();
+  }
+
+  CharAllocator(const CharAllocator&) = delete;
+  ~CharAllocator() = default;
+
+  CharAllocator& operator=(const CharAllocator&) = delete;
+
+  void* Allocate() {
+    if (last_list_->IsFull()) {
+      // Only allocate a new list if there isn't a spare one still there from
+      // previous usage.
+      if (last_list_index_ + 1 >= storage_.size())
+        AllocateNewList(last_list_->capacity * 2);
+
+      ++last_list_index_;
+      last_list_ = storage_[last_list_index_].get();
+    }
+
+    ++size_;
+    return last_list_->AddElement();
+  }
+
+  size_t alignment() const { return alignment_; }
+  size_t element_size() const { return element_size_; }
+  size_t list_count() const { return storage_.size(); }
+  size_t size() const { return size_; }
+  bool IsEmpty() const { return size() == 0; }
+
+  size_t Capacity() const {
+    size_t capacity_sum = 0;
+    for (const auto& inner_list : storage_)
+      capacity_sum += inner_list->capacity;
+    return capacity_sum;
+  }
+
+  void Clear() {
+    // Remove all except for the first InnerList.
+    DCHECK(!storage_.empty());
+    storage_.erase(storage_.begin() + 1, storage_.end());
+    last_list_index_ = 0;
+    last_list_ = storage_[0].get();
+    last_list_->size = 0;
+    size_ = 0;
+  }
+
+  void RemoveLast() {
+    DCHECK(!IsEmpty());
+    last_list_->RemoveLast();
+    if (last_list_->IsEmpty() && last_list_index_ > 0) {
+      --last_list_index_;
+      last_list_ = storage_[last_list_index_].get();
+
+      // If there are now two empty inner lists, free one of them.
+      if (last_list_index_ + 2 < storage_.size())
+        storage_.pop_back();
+    }
+    --size_;
+  }
+
+  void Erase(PositionInCharAllocator* position) {
+    DCHECK_EQ(this, position->ptr_to_container);
+
+    // Update |position| to point to the element after the erased element.
+    InnerList* list = storage_[position->vector_index].get();
+    char* item_iterator = position->item_iterator;
+    if (item_iterator == list->LastElement())
+      position->Increment();
+
+    list->Erase(item_iterator);
+    // TODO(weiliangc): Free the InnerList if it is empty.
+    --size_;
+  }
+
+  void InsertBefore(ListContainerHelper::Iterator* position, size_t count) {
+    if (!count)
+      return;
+
+    // If |position| is End(), then append |count| elements at the end. This
+    // will happen to not invalidate any iterators or memory.
+    if (!position->item_iterator) {
+      // Set |position| to be the first inserted element.
+      Allocate();
+      position->vector_index = storage_.size() - 1;
+      position->item_iterator = storage_[position->vector_index]->LastElement();
+      // Allocate the rest.
+      for (size_t i = 1; i < count; ++i)
+        Allocate();
+    } else {
+      storage_[position->vector_index]->InsertBefore(
+          alignment_, &position->item_iterator, count);
+      size_ += count;
+    }
+  }
+
+  InnerList* InnerListById(size_t id) const {
+    DCHECK_LT(id, storage_.size());
+    return storage_[id].get();
+  }
+
+  size_t FirstInnerListId() const {
+    // |size_| > 0 means that at least one vector in |storage_| will be
+    // non-empty.
+    DCHECK_GT(size_, 0u);
+    size_t id = 0;
+    while (storage_[id]->size == 0)
+      ++id;
+    return id;
+  }
+
+  size_t LastInnerListId() const {
+    // |size_| > 0 means that at least one vector in |storage_| will be
+    // non-empty.
+    DCHECK_GT(size_, 0u);
+    size_t id = storage_.size() - 1;
+    while (storage_[id]->size == 0)
+      --id;
+    return id;
+  }
+
+  size_t NumAvailableElementsInLastList() const {
+    return last_list_->NumElementsAvailable();
+  }
+
+ private:
+  void AllocateNewList(size_t list_size) {
+    std::unique_ptr<InnerList> new_list(new InnerList);
+    new_list->capacity = list_size;
+    new_list->size = 0;
+    new_list->step = element_size_;
+    new_list->data.reset(static_cast<char*>(
+        base::AlignedAlloc(list_size * element_size_, alignment_)));
+    storage_.push_back(std::move(new_list));
+  }
+
+  std::vector<std::unique_ptr<InnerList>> storage_;
+  const size_t alignment_;
+  const size_t element_size_;
+
+  // The number of elements in the list.
+  size_t size_;
+
+  // The index of the last list to have had elements added to it, or the only
+  // list if the container has not had elements added since being cleared.
+  size_t last_list_index_;
+
+  // This is equivalent to |storage_[last_list_index_]|.
+  InnerList* last_list_;
+};
+
+ }  // namespace cc
+ 
+ #endif  // CC_BASE_LIST_CONTAINER_HELPER_H_
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index e03df6f4..3e595591 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -1,4 +1,4 @@
-From be5e6f573faedf13d6f327bd168a3d90e840a3ae Mon Sep 17 00:00:00 2001
+From d38a63908f5c49705abd85bd9c2aee0ec334221d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:01:12 -0700
 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index 6df3ce0e..2fdb0d82 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
-From 51795812310685d2a392e3592b238a6fb92b75d3 Mon Sep 17 00:00:00 2001
+From 4b16ad982ff10945a37a7dd90735a5a1be3d6a8b Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:09:06 -0700
 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 2 files changed, 4 insertions(+), 2 deletions(-)
 diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
-index a09bbf2c56e..b309f6b694e 100644
+index 5763432aa4f..ff00b7307c0 100644
 --- a/chromium/base/process/process_metrics_posix.cc
 +++ b/chromium/base/process/process_metrics_posix.cc
-@@ -100,14 +100,14 @@ size_t ProcessMetrics::GetMallocUsage() {
+@@ -109,14 +109,14 @@ size_t ProcessMetrics::GetMallocUsage() {
   malloc_statistics_t stats = {0};
   malloc_zone_statistics(nullptr, &stats);
   return stats.size_in_use;
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch
index a4cffc76..05576b02 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch
@@ -1,4 +1,4 @@
-From 67c66a3af0a0268f1ab9a9af47d002cd75b57ca1 Mon Sep 17 00:00:00 2001
+From e087d26af9bdd2f045f8a81fdd2688c50b77e938 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:37:49 -0700
 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 1 insertion(+)
 diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
-index 13aa415e250..9d1309b836f 100644
+index ca5936d6e63..5484dbadfbd 100644
 --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
 +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
 @@ -154,6 +154,7 @@ extern "C" {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index c09d7ad0..ad7a085f 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
-From 612a1903c096dc497ecf2324a97fdab000dc1ae3 Mon Sep 17 00:00:00 2001
+From 5cde4d2fb5affc6e739dba412453b4bf076f19e9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:38:37 -0700
 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
index e2c738ae..2fdc4944 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
-From 4ba6b9ae21289cbaa04b531082e1089c06c845bc Mon Sep 17 00:00:00 2001
+From 04a11fa6f38987091b6b65244950d3d83579c9a8 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:54:38 -0700
 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
index ec54908b..81d555f9 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -1,4 +1,4 @@
-From 02c6554c372709fd8573d66e4f128ffe0d74f237 Mon Sep 17 00:00:00 2001
+From 59ab7f11b90bd2114ff8cc16d6502e0ad6bb6538 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 15:09:02 -0700
 Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
-index 1233ae2a8aa..6f1b3e87224 100644
+index e6838ebda84..7296cc9ed81 100644
 --- a/chromium/base/allocator/allocator_shim.cc
 +++ b/chromium/base/allocator/allocator_shim.cc
 @@ -351,7 +351,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
index c9080a07..b611781b 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
@@ -1,4 +1,4 @@
-From 1099551ba6ee52734d14c29232837720a7454669 Mon Sep 17 00:00:00 2001
+From b8735496287b7c2a15224f7d837dc74a09434bdb 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index 459f13ba..4b531624 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
-From 106c8aa7bc2dab7f7b04014d85d93082fae20632 Mon Sep 17 00:00:00 2001
+From 09c0c63a65770465ef2ec0a3b028e22a9a0164f6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 15:27:50 -0700
 Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 create mode 100644 chromium/net/dns/resolv_compat.h
 diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc
-index 31c564faeee..222ff65b6e1 100644
+index ee2d5721425..bcb83b07f6e 100644
 --- a/chromium/net/dns/dns_config_service_posix.cc
 +++ b/chromium/net/dns/dns_config_service_posix.cc
 @@ -29,6 +29,10 @@
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index dbab1ab2..b20456b0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -1,4 +1,4 @@
-From b5e59b5ca71ecab2f5515162fad92524230736ec Mon Sep 17 00:00:00 2001
+From 57ebdf59c45c70ab13b724a2293fdd78241a8a37 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 15:39:57 -0700
 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch
index 790bf140..62b9531b 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,4 +1,4 @@
-From 3628242064040d8ac5c20a85dc04ba8166cc4065 Mon Sep 17 00:00:00 2001
+From 50d5b6fa29696c873830af7632b51cb4836c2210 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 16:41:23 -0700
 Subject: [PATCH] chromium: musl: Adjust default pthread stack size
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
index 58c869fa..7ed278b0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -1,4 +1,4 @@
-From c98e81a6c88d056a6e093f6fbcc985bd2d7b1ed4 Mon Sep 17 00:00:00 2001
+From 1f839bf6ac48d81a8acbf3def4f57a555a05fa18 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 25 Sep 2018 12:35:07 -0700
 Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
index bb0d13a7..34761950 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
@@ -1,4 +1,4 @@
-From 350739f3986367253e476093eaaa653b7320c54d Mon Sep 17 00:00:00 2001
+From 8f16cec0583c9de1ceb2c34a3bea527096f34075 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 25 Sep 2018 12:59:05 -0700
 Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get
@@ -13,7 +13,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 3 files changed, 4 insertions(+), 2 deletions(-)
 diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac
-index 9cca5aa069c..04139a728cc 100644
+index 492d09038f9..a6403ed8c3c 100644
 --- a/chromium/third_party/breakpad/breakpad/configure.ac
 +++ b/chromium/third_party/breakpad/breakpad/configure.ac
 @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32,
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch
index a12e28c4..631ae8a0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch
@@ -1,4 +1,4 @@
-From debbdd4f419ef2d48c3e1fb0128dc4ac6c9f687b Mon Sep 17 00:00:00 2001
+From 725941687b118b90904fbc7e6b25a288b9d3c52b 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: musl: pread pwrite
@@ -14,7 +14,7 @@ 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 e19e51dd304..5c661949d1e 100644
+index 622cc1fbf7e..cd561b80c05 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 {
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 8eec4783..a2a4d620 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -81,7 +81,7 @@ inherit qmake5
 inherit gettext
 inherit pythonnative
 inherit perlnative
-inherit distro_features_check
+inherit features_check
 # Static builds of QtWebEngine aren't supported.
 CONFLICT_DISTRO_FEATURES = "qt5-static"
@@ -137,8 +137,8 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "77-based"
-# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13
+# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.14
-# 5.13.meta-qt5.2
+# 5.14.meta-qt5.1
 SRC_URI += " \
    ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
    file://0001-Force-host-toolchain-configuration.patch \
@@ -146,11 +146,11 @@ SRC_URI += " \
 SRC_URI_append_libc-musl = "\
    file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
    file://0003-musl-link-against-libexecinfo.patch \
-    file://0004-musl-allow-build-without-glibc.patch \
+    file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \
 "
-# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/73-based
+# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/77-based
-# 73-based.meta-qt5.3
+# 77-based.meta-qt5.1
 SRC_URI += " \
    file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
    file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
@@ -159,23 +159,25 @@ SRC_URI += " \
    file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.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/0021-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \
+    file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \
+    file://chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch;patchdir=src/3rdparty \
+    file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \
 "
 SRC_URI_append_libc-musl = "\
-    file://chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
+    file://chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
-    file://chromium/0009-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
+    file://chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
-    file://chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
+    file://chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
-    file://chromium/0011-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
+    file://chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
-    file://chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
+    file://chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
-    file://chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
+    file://chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
-    file://chromium/0014-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
+    file://chromium/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
-    file://chromium/0015-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
+    file://chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
-    file://chromium/0016-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
+    file://chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
-    file://chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
+    file://chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
-    file://chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
+    file://chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
-    file://chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
+    file://chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
-    file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
+    file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
 "
 SRCREV_qtwebengine = "79d4cf6e8eb569ec039c33e407fab787cc1a687f"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index abf63097..6cc789f0 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -49,9 +49,13 @@ EXTRA_OECMAKE += " \
 EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'"
-# JIT not supported on MIPS64
+# JIT not supported on MIPS/PPC
-EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF "
+EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON "
-EXTRA_OECMAKE_append_mips64el = " -DENABLE_JIT=OFF "
+EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON "
+# Disable gold on mips64/clang
+# mips64-yoe-linux-musl-ld.gold: internal error in get_got_page_offset, at ../../gold/mips.cc:6260
+# mips-yoe-linux-musl-ld.gold: error: Can't find matching LO16 reloc
+EXTRA_OECMAKE_append_toolchain-clang_mipsarch = " -DUSE_LD_GOLD=OFF "
 PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \
    ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
diff --git a/recipes-qt/quazip/quazip/0001-Append-LIB_ARCH-to-lib.patch b/recipes-qt/quazip/quazip/0001-Append-LIB_ARCH-to-lib.patch
new file mode 100644
index 00000000..ca281b75
--- /dev/null
+++ b/recipes-qt/quazip/quazip/0001-Append-LIB_ARCH-to-lib.patch
@@ -0,0 +1,31 @@
+From 7bcf47c1d9ca5eb27da088f93387e42b55d6999c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 19 Dec 2019 13:22:38 -0800
+Subject: [PATCH] Append LIB_ARCH to lib
+Creating subdir under lib is not expected in OE, instead it should be
+appending to lib so it becomes lib64 when needed and LIB_ARCH can be set
+in evnironment
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ quazip/quazip.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/quazip/quazip.pro b/quazip/quazip.pro
+index 3e10f36..1ea073e 100644
+--- a/quazip/quazip.pro
+++ b/quazip/quazip.pro
+@@ -42,7 +42,7 @@ CONFIG(debug, debug|release) {
+ unix:!symbian {
+     headers.path=$$PREFIX/include/quazip
+     headers.files=$$HEADERS
+-    target.path=$$PREFIX/lib/$${LIB_ARCH}
+    target.path=$$PREFIX/lib$${LIB_ARCH}
+     INSTALLS += headers target
+ 
+        OBJECTS_DIR=.obj
+-- 
+2.24.1
diff --git a/recipes-qt/quazip/quazip_0.7.3.bb b/recipes-qt/quazip/quazip_0.7.3.bb
index 970204e5..b483ced8 100644
--- a/recipes-qt/quazip/quazip_0.7.3.bb
+++ b/recipes-qt/quazip/quazip_0.7.3.bb
@@ -5,11 +5,13 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=910d778aab53617cbaf13c4e1810e289"
 DEPENDS = "qtbase"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
+           file://0001-Append-LIB_ARCH-to-lib.patch \
+          "
 SRC_URI[md5sum] = "2ba7dd8b1d6dd588374c9fab5c46e76e"
 SRC_URI[sha256sum] = "2ad4f354746e8260d46036cde1496c223ec79765041ea28eb920ced015e269b5"
 inherit qmake5
-EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
+EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix} LIB_ARCH=${@d.getVar('baselib').replace('lib', '')}"
 EXTRA_QMAKEVARS_POST += "SUBDIRS=${BPN}"
diff --git a/recipes-qt/qwt/qwt-qt5_6.1.4.bb b/recipes-qt/qwt/qwt-qt5_6.1.4.bb
index d8e1dcd2..623b45e5 100644
--- a/recipes-qt/qwt/qwt-qt5_6.1.4.bb
+++ b/recipes-qt/qwt/qwt-qt5_6.1.4.bb
@@ -8,6 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88"
 DEPENDS = "qtbase qtsvg qttools"
+COMPATIBLE_HOST_toolchain-clang_riscv32 = "null"
+COMPATIBLE_HOST_toolchain-clang_riscv64 = "null"
 inherit qmake5
 SRC_URI = " \
author	Samuli Piippo <samuli.piippo@qt.io>	2020-01-13 15:42:26 +0200
committer	Samuli Piippo <samuli.piippo@qt.io>	2020-01-13 15:57:32 +0200
commit	f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch)
tree	d0094937e85e890e9379d1f1de769af62fb6e656
parent	9ff0a36249205d36bb44cc34a26cb6201180a89f (diff)
parent	1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff)
download	meta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz