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

- Several modules are actually newer than beta4 in upstream,
  hence the conflicts with SRCREVs.
- Replaced/removed local QPainterPath patches for qwt &
  creator with upstream ones.
- Updated the qtwebkit SRCREV to sync with upstream as it
  switched to same "5.212" branch as locally already, but
  kept the riscv patch

* upstream/master:
  d6b6838e qt5: upgrade to 5.15 beta4
  05b3e648 qtwebkit: Switch to 5.212 branch
  abed512f qt5-creator: Upgrade to 4.12 branch
  32c62abe qwt-qt5: fix build with Qt 5.15
  44fc90ee gstreamer1.0-plugins-good: Reemove inserting qt5 from packageconfig

Conflicts:
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qt3d_git.bb
  recipes-qt/qt5/qt5-creator_git.bb
  recipes-qt/qt5/qt5-git.inc
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtquick3d_git.bb
  recipes-qt/qt5/qttranslations_git.bb
  recipes-qt/qt5/qtwayland_git.bb
  recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
  recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
  recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
  recipes-qt/qt5/qtwebengine_git.bb
  recipes-qt/qt5/qtwebkit_git.bb
  recipes-qt/qwt/qwt-qt5_6.1.4.bb

Change-Id: Icf6e747da78059c23568ea00ebbe50b28588aa3f

38 files changed, 177 insertions, 445 deletions

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend
deleted file mode 100644
index 50019a29..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG_append = " qt5"
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
deleted file mode 100644
index 7338f02b..00000000
--- a/recipes-qt/qt5/qt5-creator/0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 453c075b67b9d9254bf7331e1e3be287f240a9e0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 3 Sep 2019 13:31:12 -0700
-Subject: [PATCH] clangformat: AllowShortIfStatementsOnASingleLine is not
- boolean anymore
-
-https://reviews.llvm.org/D59087 has implemented multiple states for AllowShortIfStatementsOnASingleLine
-
-Fixes
-../../../../git/src/plugins/clangformat/clangformatutils.cpp:63:49: error: assigning to 'clang::format::FormatStyle::ShortIfStyle' from incompatible type 'bool'
-    style.AllowShortIfStatementsOnASingleLine = false;
-                                                ^~~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/plugins/clangformat/clangformatutils.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/plugins/clangformat/clangformatutils.cpp
-+++ b/src/plugins/clangformat/clangformatutils.cpp
-@@ -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;
-+#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
-     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/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch b/recipes-qt/qt5/qt5-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch
deleted file mode 100644
index aa21ef5e..00000000
--- a/recipes-qt/qt5/qt5-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From db11c16b977e204c7000ef689452045f85ba98b7 Mon Sep 17 00:00:00 2001
-From: Friedemann Kleint <Friedemann.Kleint@qt.io>
-Date: Thu, 12 Mar 2020 09:26:58 +0100
-Subject: [PATCH] Fix QPainterPath-related compilation errors in Qt 5.15
-
-Some include of QPainterPath was removed in Qt, causing errors like:
-
-easingpane\easinggraph.cpp(258): error C2079: 'path' uses undefined class 'QPainterPath'
-easingpane\easinggraph.cpp(275): error C2027: use of undefined type 'QPainterPath'
-easingpane\easinggraph.cpp(305): error C2664: 'void QPainter::drawPath(const QPainterPath &)': cannot convert argument 1 from 'int'
-to 'const QPainterPath &'
-easingpane\easinggraph.cpp(305): note: Reason: cannot convert from 'int' to 'const QPainterPath'
-easingpane\easinggraph.cpp(305): note: use of undefined type 'QPainterPath'
-...
-
-Add the missing include statements.
-
-Change-Id: I4f3383cbcec891a52480a683c9c76ed5deee2b2a
-Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-(cherry picked from commit b8ad0fdae90679b18238f58522058ea9b5934646)
----
- src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp  | 2 ++
- src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp | 1 +
- src/libs/qmleditorwidgets/easingpane/easinggraph.cpp       | 1 +
- src/plugins/coreplugin/fancyactionbar.cpp                  | 1 +
- src/plugins/coreplugin/manhattanstyle.cpp                  | 1 +
- src/plugins/texteditor/texteditor.cpp                      | 1 +
- src/plugins/texteditor/texteditoroverlay.cpp               | 1 +
- 7 files changed, 8 insertions(+)
-
-diff --git a/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp b/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp
-index 880835287a..930f8450ad 100644
---- a/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp
-+++ b/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp
-@@ -27,6 +27,8 @@
- 
- #include "shapes.h"
- 
-+#include <QPainterPath>
-+
- namespace qmt {
- 
- ShapePaintVisitor::ShapePaintVisitor(QPainter *painter, const QPointF &scaledOrigin, const QSizeF &originalSize,
-diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
-index d43b458881..ded1b544af 100644
---- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
-+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
-@@ -30,6 +30,7 @@
- 
- #include <QGraphicsPixmapItem>
- #include <QGraphicsScene>
-+#include <QPainterPath>
- #include <QPropertyAnimation>
- #include <QSequentialAnimationGroup>
- 
-diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
-index 4163569c04..e8360e0db6 100644
---- a/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
-+++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
-@@ -26,6 +26,7 @@
- #include "easinggraph.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleOptionGraphicsItem>
- #include <math.h>
- 
-diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
-index 8d496ea3d2..72875823a2 100644
---- a/src/plugins/coreplugin/fancyactionbar.cpp
-+++ b/src/plugins/coreplugin/fancyactionbar.cpp
-@@ -38,6 +38,7 @@
- #include <QEvent>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmapCache>
- #include <QPropertyAnimation>
- #include <QStyle>
-diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
-index 709dcf62aa..156cac322e 100644
---- a/src/plugins/coreplugin/manhattanstyle.cpp
-+++ b/src/plugins/coreplugin/manhattanstyle.cpp
-@@ -43,6 +43,7 @@
- #include <QLineEdit>
- #include <QMenuBar>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QStatusBar>
- #include <QStyleFactory>
-diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
-index 59926e31ea..576dea22d8 100644
---- a/src/plugins/texteditor/texteditor.cpp
-+++ b/src/plugins/texteditor/texteditor.cpp
-@@ -98,6 +98,7 @@
- #include <QMessageBox>
- #include <QMimeData>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPrintDialog>
- #include <QPrinter>
- #include <QPropertyAnimation>
-diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp
-index a33ca13810..431045f1db 100644
---- a/src/plugins/texteditor/texteditoroverlay.cpp
-+++ b/src/plugins/texteditor/texteditoroverlay.cpp
-@@ -30,6 +30,7 @@
- #include <QDebug>
- #include <QMap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTextBlock>
- 
- #include <algorithm>
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb
index e7cbfef8..000e135e 100644
--- a/recipes-qt/qt5/qt5-creator_git.bb
+++ b/recipes-qt/qt5/qt5-creator_git.bb
@@ -18,15 +18,13 @@ DEPENDS += "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qtto
 DEPENDS_append_toolchain-clang = " clang llvm-common"
 DEPENDS_append_libc-musl = " libexecinfo"
 
-SRCREV = "8181363fa90eb651591bf71e1a840e1c998429f4"
-PV = "4.9.2+git${SRCPV}"
+SRCREV = "9e057a55368286058023510efc328f68250ecb5e"
+PV = "4.12.0+git${SRCPV}"
 
 # Patches from https://github.com/meta-qt5/qtcreator/commits/b4.9.2
 # 4.9.2.meta-qt5.1
 SRC_URI = " \
-    git://code.qt.io/qt-creator/qt-creator.git;branch=4.9 \
-    file://0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch \
-    file://0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch \
+    git://code.qt.io/qt-creator/qt-creator.git;branch=4.12 \
 "
 SRC_URI_append_libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch"
 
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 c3597eaf..9b8ddef0 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 e4a6ca9bf08383ec3c271746edc9e970f4cd2412 Mon Sep 17 00:00:00 2001
+From 4575335a6a8b0727363afa03336c1762a340d7cf 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 2aa345c2..a55dc128 100644
+index c02af390..98af1d68 100644
 --- a/src/buildtools/config/linux.pri
 +++ b/src/buildtools/config/linux.pri
 @@ -122,7 +122,7 @@ contains(QT_ARCH, "mips") {
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 57c0afa2..3470e9c9 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 e4f1790fd91b5d214b5a524575d815530a587ac2 Mon Sep 17 00:00:00 2001
+From ee0700753d1fc3001da7df9e91d7478b60598e96 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 baf62462..058a90fc 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 15a79d185bf9b275ae0eb09041758021a178774f Mon Sep 17 00:00:00 2001
+From 9a99864ceed71eebcbfbbcbc90b877a9ad505b20 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
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
index e7377cfc..0f0f534d 100644
--- 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
@@ -1,4 +1,4 @@
-From e6a216265bf68f600682c7d27a2542c4f385e085 Mon Sep 17 00:00:00 2001
+From 947bba762706f6212b6e44e15364af129c49f8c5 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
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 8e008832..7916d99c 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 af441fca2705c866fe9d6699dd2ddc388a5412e2 Mon Sep 17 00:00:00 2001
+From d6b2b2a9cf25009f13fb2bef5eebfdeef471bbb6 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 3c211ca4..fd9301a8 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 1f4c9aaaa625ed6c4a84eed9bed143de056d3535 Mon Sep 17 00:00:00 2001
+From 18af47b85fb13b6e9f1d88a8beb3c01745c75ebb 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 9276f5627af..622cc1fbf7e 100644
+index 8e0cc385792..d2bd9df4d40 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 00241951..eeb3f640 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 9329f596101b65b166e635f04f617b01f955697f Mon Sep 17 00:00:00 2001
+From dd5033e3b9a425b3435629d9e8901b8445119fdb 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
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 bed1c564..546fcac6 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 ab04dfceba3db888c5e8d6416668850dc0bb677e Mon Sep 17 00:00:00 2001
+From 66d28dccd67ca1095804ef1293d499fd5a2d1d6a Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 5 Feb 2019 14:32:20 -0800
 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
-index cd9fed01e5a..42070dd80fa 100644
+index 4422fecc0c8..1b398ad981a 100644
 --- a/chromium/third_party/zlib/BUILD.gn
 +++ b/chromium/third_party/zlib/BUILD.gn
-@@ -78,8 +78,11 @@ if (use_arm_neon_optimizations) {
+@@ -80,8 +80,11 @@ if (use_arm_neon_optimizations) {
      # Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
      #  "All implementations of the ARMv8.1 architecture are required to
      #   implement the CRC32* instructions. These are optional in ARMv8.0."
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 0e8e3bf4..4d95414e 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 097b6df14e56a9bd800a277d65e117fec96372a0 Mon Sep 17 00:00:00 2001
+From c820f61ac2e254758e863175423be6387907df81 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,10 +17,10 @@ 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 f5ac335af90..70b352f1ed1 100644
+index 13d71d04030..3ebcf1ddbc3 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -775,15 +775,6 @@ config("compiler_cpu_abi") {
+@@ -780,15 +780,6 @@ config("compiler_cpu_abi") {
      } else if (current_cpu == "arm") {
        if (is_clang && !is_android && !is_nacl) {
        }
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 6884d101..851d73ae 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 dcb8f604a55c9d255102b8939dae1d5464398892 Mon Sep 17 00:00:00 2001
+From 98af1c4ce180f029e6fa1a1dfdf438296eb7dae2 Mon Sep 17 00:00:00 2001
 From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 Date: Thu, 8 Mar 2018 15:39:55 +0100
 Subject: [PATCH] chromium: aarch64 skia build fix
@@ -28,7 +28,7 @@ Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
  1 file changed, 2 insertions(+), 15 deletions(-)
 
 diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
-index 7322807095f..0d6f981e895 100644
+index 0d610ccfe33..c1844b61168 100644
 --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
 +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
 @@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) {
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 507f8b8b..3220ae9d 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 da4adf97a2ee92a058f6f04a406d6447d05a657a Mon Sep 17 00:00:00 2001
+From 3ef0d63778bdafca66017a6d1d5599f5c92f21b3 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 c1d6d26acc6..6de81b751dd 100644
+index ead4e57dc15..7ba975e660a 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/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
index 8bf8eee0..0189a7ec 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -1,4 +1,4 @@
-From ac2c4d67820f7d571b2b6a2b64fcb145aabb3cec Mon Sep 17 00:00:00 2001
+From 172ab111e6d2626780bb4fb22e4c4e74106a802e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 30 Nov 2019 10:07:43 -0800
 Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
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
index 9f8caba7..e494e061 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
@@ -1,4 +1,4 @@
-From 9a4797b32a3a3014bb9cd9811a755185a738b59b Mon Sep 17 00:00:00 2001
+From e8f23ce32baf1e0d9c2249e50c949c9cd86095e0 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
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
index c2a0338c..b64fd9a3 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
@@ -1,4 +1,4 @@
-From 046704d6ac338b548a85dc1f7af5810276175a9f Mon Sep 17 00:00:00 2001
+From 6211643cff8c828be75f6504ec16246f8746add4 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
index fa382f9d..d97e9bd7 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
@@ -1,4 +1,4 @@
-From 905c5b699f97105029a498096b3b6b3c8736cfeb Mon Sep 17 00:00:00 2001
+From 75d5b91b202dc2f5ff380cc36fdb9ac50f6c80ca Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 15 Jan 2020 16:53:46 -0800
 Subject: [PATCH] chromium: Include <cstddef> and <cstdint>
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
index fc95edd7..a5b0ec6c 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
@@ -1,4 +1,4 @@
-From c00840448ba1df98a8e9d831bc3ddb795cf37a98 Mon Sep 17 00:00:00 2001
+From 7a7008c0705cdea1acdb77eb51dd98003b15f7c4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 1 Feb 2020 12:17:23 -0800
 Subject: [PATCH] chromium: Link v8 with libatomic on x86
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index 0e5b2b22..90700798 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -1,4 +1,4 @@
-From fbd1beb51ff1da1fba180f7f0ca239975d47276b Mon Sep 17 00:00:00 2001
+From 85dc2559eab2d6f02c0e09bf5895af4668239294 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/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index ef12eec3..59ea43ab 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
-From b941a200af8547946255c383b29c3f7b68598a75 Mon Sep 17 00:00:00 2001
+From 06ade5afbcb37a77d8488291f812cc9049fdb55e 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch
index 3de13d9a..3fc011e2 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch
@@ -1,4 +1,4 @@
-From 35c208fa2c7f8f189b8125b16fca8356d88920a7 Mon Sep 17 00:00:00 2001
+From a4ce19d536f36de6f2065bb8bed6aa451a466664 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index 9308ef78..2d433807 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
-From 5134d082447b67b2459ee1e84f4aa2ee3937b19a Mon Sep 17 00:00:00 2001
+From 4ac8cae0c6c23b1d64c405a0c3919465a82c6b47 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/0017-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch
index c5b4b457..ae5d18ea 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
-From b80a61e044cd4cca307cbe706684e7136fd79601 Mon Sep 17 00:00:00 2001
+From 9819554c2d70a95d9cd418349baa076c10cb5d76 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/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
index 3e2c8ddd..2d8839de 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -1,4 +1,4 @@
-From 854c9b6e21e2afaeb427c32ba57eee870f45e817 Mon Sep 17 00:00:00 2001
+From c7dcc21ee04718b6852af0ca161451c0d35f3cbc 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
index 1236555d..c1da92de 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
@@ -1,4 +1,4 @@
-From bdbf26f52d06dbc61ad934f14ac0bbb036a96a39 Mon Sep 17 00:00:00 2001
+From f9bfe2d381e1ee94ec924d521e57e04661df15c7 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/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index d6671065..ac7c30ef 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
-From 9604eab855a715b2ab30109f227d75269e3f2001 Mon Sep 17 00:00:00 2001
+From 7453ddb3c603814e8649df09dbe4ee273da1ca8f 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index a0208998..a49be3ec 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -1,4 +1,4 @@
-From 45b236215d3c082b30c8d68421c65828415d85f2 Mon Sep 17 00:00:00 2001
+From bebaeea8a0025d035190622700421ab45821345c 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/0022-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
index f9bbc1c2..d5bf4132 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,4 +1,4 @@
-From e9bab0dfd2bd66ad883d5e67e7b2ffca7a12bfff Mon Sep 17 00:00:00 2001
+From 146508f20c7008e7b601470e711d322e9b4bde93 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/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
index f7a0ec04..85c9de51 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -1,4 +1,4 @@
-From 871e56119bdf17db727572ab18f31f0671c5a315 Mon Sep 17 00:00:00 2001
+From 42251b50702ea76c12cb57327e34c0cf40cbd510 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/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
index f502b74e..29405638 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
@@ -1,4 +1,4 @@
-From 3014e7511b95d88d5b1bf2ab860e54acf2f0dc09 Mon Sep 17 00:00:00 2001
+From 6469bf2b401f1cce1d4258ba8cae0746b8559300 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
index ee5ca7d1..e4cb8794 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
@@ -1,4 +1,4 @@
-From 3a243b9e35dadac30cff5ee2efd2917818eda177 Mon Sep 17 00:00:00 2001
+From feceed2ff7bb63d5d9b1d1fcf3207fc8c91b87ed 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 622cc1fbf7e..cd561b80c05 100644
+index d2bd9df4d40..88ea7f508aa 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 253b53c7..c2752fc5 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -145,7 +145,7 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "80-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15
-# 5.15.meta-qt5.4
+# 5.15.meta-qt5.5
 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 \
@@ -156,8 +156,8 @@ SRC_URI_append_libc-musl = "\
     file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \
 "
 
-# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/79-based
-# 79-based.meta-qt5.2
+# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based
+# 80-based.meta-qt5.2
 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 \
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 8fd2aee8..b6783129 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -85,4 +85,4 @@ PACKAGES_remove = "${PN}-examples"
 
 QT_MODULE_BRANCH = "5.212"
 
-SRCREV = "444bd2bda5fa46c2b4b99adaf6e9b2074b03a0d1"
+SRCREV = "10cd6a106e1c461c774ca166a67b8c835c755ef7"
diff --git a/recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch b/recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch
deleted file mode 100644
index 71a5c7ba..00000000
--- a/recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From 4f432cfcb19f41e6a4ec8d3c7f871f66e461fb63 Mon Sep 17 00:00:00 2001
-From: Mikko Gronoff <mikko.gronoff@qt.io>
-Date: Thu, 12 Mar 2020 13:14:29 +0200
-Subject: [PATCH] fix qpainterpath build issues
-
----
- examples/dials/attitude_indicator.cpp | 1 +
- examples/itemeditor/editor.cpp        | 1 +
- examples/sinusplot/sinusplot.cpp      | 1 +
- src/qwt_compass_rose.cpp              | 1 +
- src/qwt_dial_needle.cpp               | 1 +
- src/qwt_null_paintdevice.cpp          | 1 +
- src/qwt_painter.cpp                   | 1 +
- src/qwt_painter_command.cpp           | 1 +
- src/qwt_painter_command.h             | 1 +
- src/qwt_picker.cpp                    | 1 +
- src/qwt_plot_canvas.cpp               | 1 +
- src/qwt_plot_glcanvas.cpp             | 1 +
- src/qwt_plot_glcanvas.h               | 1 +
- src/qwt_plot_panner.cpp               | 1 +
- src/qwt_plot_renderer.cpp             | 1 +
- src/qwt_plot_shapeitem.cpp            | 1 +
- src/qwt_widget_overlay.cpp            | 1 +
- 17 files changed, 17 insertions(+)
-
-diff --git a/examples/dials/attitude_indicator.cpp b/examples/dials/attitude_indicator.cpp
-index ea0d5ab..a01611e 100644
---- a/examples/dials/attitude_indicator.cpp
-+++ b/examples/dials/attitude_indicator.cpp
-@@ -3,6 +3,7 @@
- #include <qwt_round_scale_draw.h>
- #include <qevent.h>
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qpolygon.h>
- 
- AttitudeIndicatorNeedle::AttitudeIndicatorNeedle( const QColor &color )
-diff --git a/examples/itemeditor/editor.cpp b/examples/itemeditor/editor.cpp
-index bd06372..7c4a6ef 100644
---- a/examples/itemeditor/editor.cpp
-+++ b/examples/itemeditor/editor.cpp
-@@ -4,6 +4,7 @@
- #include <qwt_scale_map.h>
- #include <qwt_plot_shapeitem.h>
- #include <qevent.h>
-+#include <qpainterpath.h>
- 
- class Overlay: public QwtWidgetOverlay
- {
-diff --git a/examples/sinusplot/sinusplot.cpp b/examples/sinusplot/sinusplot.cpp
-index 119fa4a..6a9bfe7 100644
---- a/examples/sinusplot/sinusplot.cpp
-+++ b/examples/sinusplot/sinusplot.cpp
-@@ -1,5 +1,6 @@
- #include <qapplication.h>
- #include <qlayout.h>
-+#include <qpainterpath.h>
- #include <qwt_plot.h>
- #include <qwt_plot_marker.h>
- #include <qwt_plot_curve.h>
-diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp
-index 05f7039..fbd30fe 100644
---- a/src/qwt_compass_rose.cpp
-+++ b/src/qwt_compass_rose.cpp
-@@ -11,6 +11,7 @@
- #include "qwt_point_polar.h"
- #include "qwt_painter.h"
- #include <qpainter.h>
-+#include <qpainterpath.h>
- 
- static QPointF qwtIntersection(
-     QPointF p11, QPointF p12, QPointF p21, QPointF p22 )
-diff --git a/src/qwt_dial_needle.cpp b/src/qwt_dial_needle.cpp
-index 49dd44a..d98f68c 100644
---- a/src/qwt_dial_needle.cpp
-+++ b/src/qwt_dial_needle.cpp
-@@ -13,6 +13,7 @@
- #include "qwt_painter.h"
- #include <qapplication.h>
- #include <qpainter.h>
-+#include <qpainterpath.h>
- 
- #if QT_VERSION < 0x040601
- #define qFastSin(x) qSin(x)
-diff --git a/src/qwt_null_paintdevice.cpp b/src/qwt_null_paintdevice.cpp
-index 3baf0e9..468a838 100644
---- a/src/qwt_null_paintdevice.cpp
-+++ b/src/qwt_null_paintdevice.cpp
-@@ -9,6 +9,7 @@
- 
- #include "qwt_null_paintdevice.h"
- #include <qpaintengine.h>
-+#include <qpainterpath.h>
- #include <qpixmap.h>
- 
- class QwtNullPaintDevice::PrivateData
-diff --git a/src/qwt_painter.cpp b/src/qwt_painter.cpp
-index 7959fe5..626677f 100644
---- a/src/qwt_painter.cpp
-+++ b/src/qwt_painter.cpp
-@@ -17,6 +17,7 @@
- #include <qframe.h>
- #include <qrect.h>
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qpalette.h>
- #include <qpaintdevice.h>
- #include <qpixmap.h>
-diff --git a/src/qwt_painter_command.cpp b/src/qwt_painter_command.cpp
-index 39faca9..fcd068d 100644
---- a/src/qwt_painter_command.cpp
-+++ b/src/qwt_painter_command.cpp
-@@ -7,6 +7,7 @@
-  * modify it under the terms of the Qwt License, Version 1.0
-  *****************************************************************************/
- 
-+#include <qpainterpath.h>
- #include "qwt_painter_command.h"
- 
- //! Construct an invalid command
-diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h
-index a2f509a..fab52a8 100644
---- a/src/qwt_painter_command.h
-+++ b/src/qwt_painter_command.h
-@@ -12,6 +12,7 @@
- 
- #include "qwt_global.h"
- #include <qpaintengine.h>
-+#include <qpainterpath.h>
- #include <qpixmap.h>
- #include <qimage.h>
- #include <qpolygon.h>
-diff --git a/src/qwt_picker.cpp b/src/qwt_picker.cpp
-index dfd7e9b..3e20578 100644
---- a/src/qwt_picker.cpp
-+++ b/src/qwt_picker.cpp
-@@ -15,6 +15,7 @@
- #include <qapplication.h>
- #include <qevent.h>
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qframe.h>
- #include <qcursor.h>
- #include <qbitmap.h>
-diff --git a/src/qwt_plot_canvas.cpp b/src/qwt_plot_canvas.cpp
-index 9438f15..bfe660d 100644
---- a/src/qwt_plot_canvas.cpp
-+++ b/src/qwt_plot_canvas.cpp
-@@ -13,6 +13,7 @@
- #include "qwt_math.h"
- #include "qwt_plot.h"
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qstyle.h>
- #include <qstyleoption.h>
- #include <qpaintengine.h>
-diff --git a/src/qwt_plot_glcanvas.cpp b/src/qwt_plot_glcanvas.cpp
-index 996c0ad..6975863 100644
---- a/src/qwt_plot_glcanvas.cpp
-+++ b/src/qwt_plot_glcanvas.cpp
-@@ -12,6 +12,7 @@
- #include "qwt_painter.h"
- #include <qevent.h>
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qdrawutil.h>
- #include <qstyle.h>
- #include <qstyleoption.h>
-diff --git a/src/qwt_plot_glcanvas.h b/src/qwt_plot_glcanvas.h
-index 7ca9b5a..a2dfeda 100644
---- a/src/qwt_plot_glcanvas.h
-+++ b/src/qwt_plot_glcanvas.h
-@@ -12,6 +12,7 @@
- 
- #include "qwt_global.h"
- #include <qframe.h>
-+#include <qpainterpath.h>
- #include <qgl.h>
- 
- class QwtPlot;
-diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp
-index b7daa05..59bd2df 100644
---- a/src/qwt_plot_panner.cpp
-+++ b/src/qwt_plot_panner.cpp
-@@ -12,6 +12,7 @@
- #include "qwt_plot.h"
- #include "qwt_painter.h"
- #include <qbitmap.h>
-+#include <qpainterpath.h>
- #include <qstyle.h>
- #include <qstyleoption.h>
- 
-diff --git a/src/qwt_plot_renderer.cpp b/src/qwt_plot_renderer.cpp
-index 549c4bc..71cadec 100644
---- a/src/qwt_plot_renderer.cpp
-+++ b/src/qwt_plot_renderer.cpp
-@@ -20,6 +20,7 @@
- #include "qwt_math.h"
- 
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qtransform.h>
- #include <qprinter.h>
- #include <qfiledialog.h>
-diff --git a/src/qwt_plot_shapeitem.cpp b/src/qwt_plot_shapeitem.cpp
-index db7896b..56bc208 100644
---- a/src/qwt_plot_shapeitem.cpp
-+++ b/src/qwt_plot_shapeitem.cpp
-@@ -7,6 +7,7 @@
-  * modify it under the terms of the Qwt License, Version 1.0
-  *****************************************************************************/
- 
-+#include <qpainterpath.h>
- #include "qwt_plot_shapeitem.h"
- #include "qwt_scale_map.h"
- #include "qwt_painter.h"
-diff --git a/src/qwt_widget_overlay.cpp b/src/qwt_widget_overlay.cpp
-index 5974413..fa6da48 100644
---- a/src/qwt_widget_overlay.cpp
-+++ b/src/qwt_widget_overlay.cpp
-@@ -10,6 +10,7 @@
- #include "qwt_widget_overlay.h"
- #include "qwt_painter.h"
- #include <qpainter.h>
-+#include <qpainterpath.h>
- #include <qpaintengine.h>
- #include <qimage.h>
- #include <qevent.h>
diff --git a/recipes-qt/qwt/qwt-qt5/0001-missing-qpainterpath.h-include-added-needed-with-Qt-.patch b/recipes-qt/qwt/qwt-qt5/0001-missing-qpainterpath.h-include-added-needed-with-Qt-.patch
new file mode 100644
index 00000000..5caf7930
--- /dev/null
+++ b/recipes-qt/qwt/qwt-qt5/0001-missing-qpainterpath.h-include-added-needed-with-Qt-.patch
@@ -0,0 +1,131 @@
+From c44af9a6f0eff02b439ef770755da551f281e9ad Mon Sep 17 00:00:00 2001
+From: rathmann <rathmann@29e17f8d-cf37-471e-a288-72cc03a76eda>
+Date: Sun, 29 Mar 2020 09:11:29 +0000
+Subject: [PATCH] missing qpainterpath.h include added needed with Qt 5.15
+ Beta2
+
+Partial backport from
+https://sourceforge.net/p/qwt/code/3187/
+
+---
+diff -uNr qwt-6.1.4.orig/src/qwt_compass_rose.cpp qwt-6.1.4/src/qwt_compass_rose.cpp
+--- qwt-6.1.4.orig/src/qwt_compass_rose.cpp     2019-01-02 17:21:31.280460826 +0100
++++ qwt-6.1.4/src/qwt_compass_rose.cpp  2020-04-14 13:33:27.214932546 +0200
+@@ -11,6 +11,7 @@
+ #include "qwt_point_polar.h"
+ #include "qwt_painter.h"
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ 
+ static QPointF qwtIntersection(
+     QPointF p11, QPointF p12, QPointF p21, QPointF p22 )
+diff -uNr qwt-6.1.4.orig/src/qwt_dial_needle.cpp qwt-6.1.4/src/qwt_dial_needle.cpp
+--- qwt-6.1.4.orig/src/qwt_dial_needle.cpp      2019-01-02 17:21:31.284460922 +0100
++++ qwt-6.1.4/src/qwt_dial_needle.cpp   2020-04-14 13:33:37.006864250 +0200
+@@ -13,6 +13,7 @@
+ #include "qwt_painter.h"
+ #include <qapplication.h>
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ 
+ #if QT_VERSION < 0x040601
+ #define qFastSin(x) qSin(x)
+diff -uNr qwt-6.1.4.orig/src/qwt_null_paintdevice.cpp qwt-6.1.4/src/qwt_null_paintdevice.cpp
+--- qwt-6.1.4.orig/src/qwt_null_paintdevice.cpp 2019-01-02 17:21:31.296461212 +0100
++++ qwt-6.1.4/src/qwt_null_paintdevice.cpp      2020-04-14 13:31:21.983807348 +0200
+@@ -9,6 +9,7 @@
+ 
+ #include "qwt_null_paintdevice.h"
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+ 
+ class QwtNullPaintDevice::PrivateData
+diff -uNr qwt-6.1.4.orig/src/qwt_painter_command.h qwt-6.1.4/src/qwt_painter_command.h
+--- qwt-6.1.4.orig/src/qwt_painter_command.h    2020-04-14 13:29:35.128556140 +0200
++++ qwt-6.1.4/src/qwt_painter_command.h 2020-04-14 13:28:23.957056341 +0200
+@@ -15,6 +15,7 @@
+ #include <qpixmap.h>
+ #include <qimage.h>
+ #include <qpolygon.h>
++#include <qpainterpath.h>
+ 
+ class QPainterPath;
+ 
+diff -uNr qwt-6.1.4.orig/src/qwt_painter.cpp qwt-6.1.4/src/qwt_painter.cpp
+--- qwt-6.1.4.orig/src/qwt_painter.cpp  2019-01-02 17:21:31.452464985 +0100
++++ qwt-6.1.4/src/qwt_painter.cpp       2020-04-14 13:30:22.356224890 +0200
+@@ -19,6 +19,7 @@
+ #include <qpainter.h>
+ #include <qpalette.h>
+ #include <qpaintdevice.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+ #include <qstyle.h>
+ #include <qtextdocument.h>
+diff -uNr qwt-6.1.4.orig/src/qwt_plot_glcanvas.cpp qwt-6.1.4/src/qwt_plot_glcanvas.cpp
+--- qwt-6.1.4.orig/src/qwt_plot_glcanvas.cpp    2019-01-02 17:21:31.300461309 +0100
++++ qwt-6.1.4/src/qwt_plot_glcanvas.cpp 2020-04-14 13:33:14.947018129 +0200
+@@ -12,6 +12,7 @@
+ #include "qwt_painter.h"
+ #include <qevent.h>
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qdrawutil.h>
+ #include <qstyle.h>
+ #include <qstyleoption.h>
+diff -uNr qwt-6.1.4.orig/src/qwt_plot_panner.cpp qwt-6.1.4/src/qwt_plot_panner.cpp
+--- qwt-6.1.4.orig/src/qwt_plot_panner.cpp      2019-01-02 17:21:31.468465371 +0100
++++ qwt-6.1.4/src/qwt_plot_panner.cpp   2020-04-14 13:32:33.259309129 +0200
+@@ -14,6 +14,7 @@
+ #include <qbitmap.h>
+ #include <qstyle.h>
+ #include <qstyleoption.h>
++#include <qpainterpath.h>
+ 
+ #if QT_VERSION >= 0x050000
+ #if QT_VERSION < 0x050100
+diff -uNr qwt-6.1.4.orig/src/qwt_plot_renderer.cpp qwt-6.1.4/src/qwt_plot_renderer.cpp
+--- qwt-6.1.4.orig/src/qwt_plot_renderer.cpp    2019-01-02 17:21:31.352462567 +0100
++++ qwt-6.1.4/src/qwt_plot_renderer.cpp 2020-04-14 13:31:51.019604276 +0200
+@@ -20,6 +20,7 @@
+ #include "qwt_math.h"
+ 
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qtransform.h>
+ #include <qprinter.h>
+ #include <qfiledialog.h>
+diff -uNr qwt-6.1.4.orig/src/qwt_widget_overlay.cpp qwt-6.1.4/src/qwt_widget_overlay.cpp
+--- qwt-6.1.4.orig/src/qwt_widget_overlay.cpp   2019-01-02 17:21:31.388463437 +0100
++++ qwt-6.1.4/src/qwt_widget_overlay.cpp        2020-04-14 13:31:07.091911561 +0200
+@@ -11,6 +11,7 @@
+ #include "qwt_painter.h"
+ #include <qpainter.h>
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+ #include <qimage.h>
+ #include <qevent.h>
+ 
+diff -uNr qwt-6.1.4.orig/examples/dials/attitude_indicator.cpp qwt-6.1.4/examples/dials/attitude_indicator.cpp
+--- qwt-6.1.4.orig/examples/dials/attitude_indicator.cpp        2019-01-02 17:21:31.164458020 +0100
++++ qwt-6.1.4/examples/dials/attitude_indicator.cpp     2020-04-14 13:44:46.354218570 +0200
+@@ -3,6 +3,7 @@
+ #include <qwt_round_scale_draw.h>
+ #include <qevent.h>
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qpolygon.h>
+ 
+ AttitudeIndicatorNeedle::AttitudeIndicatorNeedle( const QColor &color )
+diff -uNr qwt-6.1.4.orig/src/qwt_plot_glcanvas.h qwt-6.1.4/src/qwt_plot_glcanvas.h
+--- qwt-6.1.4.orig/src/qwt_plot_glcanvas.h      2020-04-14 13:44:26.642354964 +0200
++++ qwt-6.1.4/src/qwt_plot_glcanvas.h   2020-04-14 13:42:38.555103164 +0200
+@@ -12,6 +12,7 @@
+ 
+ #include "qwt_global.h"
+ #include <qframe.h>
++#include <qpainterpath.h>
+ #include <qgl.h>
+ 
+ class QwtPlot;
diff --git a/recipes-qt/qwt/qwt-qt5_6.1.4.bb b/recipes-qt/qwt/qwt-qt5_6.1.4.bb
index 682ab566..18eebbf1 100644
--- a/recipes-qt/qwt/qwt-qt5_6.1.4.bb
+++ b/recipes-qt/qwt/qwt-qt5_6.1.4.bb
@@ -16,7 +16,7 @@ inherit qmake5
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \
     file://0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch \
-    file://0001-fix-qpainterpath-build-issues.patch \
+    file://0001-missing-qpainterpath.h-include-added-needed-with-Qt-.patch \
 "
 SRC_URI[qwt.md5sum] = "4fb1852f694420e3ab9c583526edecc5"
 SRC_URI[qwt.sha256sum] = "1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9"