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

* Diff in SRCREVs are due checkout from commit vs. checkout from corresponding tag in modules. The content is the same. * metatypes inclusion was a bit different in upstream, synced with upstream * update module_config.yaml * upstream/master: 02930760 qtmultimedia: create /usr/lib/plugins/videoeglvideonode referenced by Qt5MultimediaConfig.cmake b8bcf8cb qt5: upgrade to 5.15 beta3 eac416fe qtdeclarative: bump SRCREV 6558d2b5 nativesdk-qtbase: fix unpackaged files 6b2323f3 qtwebengine: update patches for beta2 20ae10f0 qt5: upgrade to 5.15 beta2 a01de873 qtwebengine: fix QT_MODULE_BRANCH_CHROMIUM b88c292a qtquick3d: Fix branch for fetching assimp submodule df67d5a7 qt3d: update patch to apply a38953a6 qt5: upgrade to latest revisions in 5.15 branch 9a645b02 qtwebengine: update patches for latest 5.15 revision 6cce9817 qtwebengine: update patches for 5.15 50e35581 qtbase: update patches for latest 5.15 revision 9f024a55 qtdeclarative: add dependency on qtdeclarative-native 76125ba8 qt5.inc: package metatypes files f3379951 qtbase: drop xkb, xcb-xinput PACKAGECONFIGs 44405373 qt5: upgrade to latest revisions in 5.15 branch 5e189731 layer: Mark dunfell as the only compatible release 3e759d82 qtwebengine: Fix build with ninja >= 1.10.0 f712bf9f python-pyqt5: remove PyQt_qreal_double from DISABLED_FEATURES 79b0f3a6 python-pyqtchart: remove PyQt_qreal_double from DISABLED_FEATURES 34ae49f8 qtmultimedia: Enable gstreamer support 108b5664 gstreamer1.0-plugins-good: Turn on qt5 packageconfig 4b6ce100 qt5-creator: Inherit mime-xdg 89de99e7 python-{pyqt5,pyqtchart}: fold .inc file into .bb 5d790449 python-pyqt5: drop python 2 recipe b2a958a4 python-pyqt5: disable whole PyQt_OpenGL and QtWidgets, QtQuickWidgets, QtQuick modules without opengl in DISTRO_FEATURES Conflicts: conf/layer.conf recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch recipes-qt/qt5/qt3d_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/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick3d_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebview_git.bb Change-Id: I61a651fd16d475ac0d8bbe119a3e3a8038692726
author: Mikko Gronoff <mikko.gronoff@qt.io> 2020-04-14 10:42:58 +0300
committer: Mikko Gronoff <mikko.gronoff@qt.io> 2020-04-15 08:19:56 +0300
commit: 7de0cbd5dc9f80972ce559c9e340afbff0b9403d (patch)
tree: a7011b9b55ba590406919a1873d01c20aea5d0ea
parent: 374abadf749bbf8f3d84e2e895c2139722447a01 (diff)
parent: 02930760c8be7c9d850919cda89469e9c0120d6c (diff)
download: meta-qt5-7de0cbd5dc9f80972ce559c9e340afbff0b9403d.tar.gz
69 files changed, 285 insertions, 312 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index e4ae70b8..d75eba32 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -163,7 +163,6 @@ build_instructions:
      # EXCLUDE_FROM_WORLD
      rm -f ${SOURCE_DIR}/recipes-qt/examples/qt5-opengles2-test_git.bb
-      rm -r ${SOURCE_DIR}/recipes-python/pyqt5/python-pyqt5_5.13.2.bb
      rm -r ${SOURCE_DIR}/recipes-qt/qt5/qtwebkit_git.bb
      bitbake $(find ${SOURCE_DIR} -name *.bb | xargs -n1 basename | sed -e 's/\([^._]*\).*/\1/')
diff --git a/conf/layer.conf b/conf/layer.conf
index e70518b7..dbaa3d6b 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -29,7 +29,7 @@ LAYERVERSION_qt5-layer = "1"
 LAYERDEPENDS_qt5-layer = "core"
-LAYERSERIES_COMPAT_qt5-layer = "sumo thud warrior zeus dunfell"
+LAYERSERIES_COMPAT_qt5-layer = "dunfell"
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend
index b514e329..50019a29 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend
@@ -1,5 +1 @@
-inherit qmake5_paths
+PACKAGECONFIG_append = " qt5"
-PACKAGECONFIG[qt5] = '-Dqt5=enabled \
-                     ,-Dqt5=disabled \
-                     ,gstreamer1.0-plugins-base qtbase qtdeclarative qtbase-native'
diff --git a/recipes-python/pyqt5/python-pyqt5.inc b/recipes-python/pyqt5/python-pyqt5.inc
deleted file mode 100644
index b830c9a9..00000000
--- a/recipes-python/pyqt5/python-pyqt5.inc
+++ /dev/null
@@ -1,63 +0,0 @@
-SUMMARY = "Python Qt5 Bindings"
-AUTHOR = "Phil Thomson @ riverbank.co.uk"
-HOMEPAGE = "http://riverbankcomputing.co.uk"
-SECTION = "devel/python"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "\
-    file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \
-"
-SRC_URI = "\
-    https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PV}/PyQt5-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "c1023cb9c3d29a89fc109b163a0175c0"
-SRC_URI[sha256sum] = "adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827"
-S = "${WORKDIR}/PyQt5-${PV}"
-inherit qmake5
-DEPENDS = "qtbase qtdeclarative qtquickcontrols2"
-export BUILD_SYS
-export HOST_SYS
-export STAGING_INCDIR
-export STAGING_LIBDIR
-PARALLEL_MAKEINST = ""
-DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager"
-DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
-PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets QtXml QtNetwork QtQml QtQuick QtQuickWidgets"
-do_configure_prepend() {
-    cd ${S}
-    echo "py_platform = linux" > pyqt.cfg
-    echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg
-    echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg
-    echo "py_pylib_lib = python$%(py_major).%(py_minor)" >> pyqt.cfg
-    echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg
-    echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg
-    echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg
-    echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg
-    echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
-    echo "qt_shared = True" >> pyqt.cfg
-    QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION`
-    echo "[Qt $QT_VERSION]" >> pyqt.cfg
-    echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
-    echo yes | ${PYTHON} configure.py --verbose --qmake  ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST}
-}
-do_compile() {
-    cd ${S}
-    oe_runmake
-}
-do_install() {
-    cd ${S}
-    oe_runmake MAKEFLAGS='-j 1' install
-}
-FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/"
-RDEPENDS_${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs"
diff --git a/recipes-python/pyqt5/python-pyqt5_5.13.2.bb b/recipes-python/pyqt5/python-pyqt5_5.13.2.bb
deleted file mode 100644
index e051b156..00000000
--- a/recipes-python/pyqt5/python-pyqt5_5.13.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require python-pyqt5.inc
-inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative python-dir", "", d)}
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
-DEPENDS += "sip sip-native python"
-RDEPENDS_${PN} += "python-core python-sip"
-PNBLACKLIST[python-pyqt5] = "Sip fails in do_configure sip: QOpenGLFramebufferObject is undefined"
diff --git a/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb b/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb
index 200a8154..6c2f4175 100644
--- a/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb
+++ b/recipes-python/pyqt5/python3-pyqt5_5.13.2.bb
@@ -1,7 +1,65 @@
-require python-pyqt5.inc
+SUMMARY = "Python Qt5 Bindings"
+AUTHOR = "Phil Thomson @ riverbank.co.uk"
+HOMEPAGE = "http://riverbankcomputing.co.uk"
+SECTION = "devel/python"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "\
+    file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \
+"
+SRC_URI = "\
+    https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PV}/PyQt5-${PV}.tar.gz \
+"
+SRC_URI[md5sum] = "c1023cb9c3d29a89fc109b163a0175c0"
+SRC_URI[sha256sum] = "adc17c077bf233987b8e43ada87d1e0deca9bd71a13e5fd5fc377482ed69c827"
+S = "${WORKDIR}/PyQt5-${PV}"
+inherit qmake5
 inherit python3native python3-dir
+DEPENDS = "qtbase qtdeclarative qtquickcontrols2"
 DEPENDS += "sip3 sip3-native python3"
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
+PARALLEL_MAKEINST = ""
+DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '', 'PyQt_OpenGL', d)}"
+PYQT_MODULES = "QtCore QtGui QtNetwork QtXml QtNetwork QtQml ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'QtQuick QtWidgets QtQuickWidgets', '', d)}"
+do_configure_prepend() {
+    cd ${S}
+    echo "py_platform = linux" > pyqt.cfg
+    echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg
+    echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg
+    echo "py_pylib_lib = python$%(py_major).%(py_minor)" >> pyqt.cfg
+    echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg
+    echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg
+    echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg
+    echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg
+    echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
+    echo "qt_shared = True" >> pyqt.cfg
+    QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION`
+    echo "[Qt $QT_VERSION]" >> pyqt.cfg
+    echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
+    echo yes | ${PYTHON} configure.py --verbose --qmake  ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST}
+}
+do_compile() {
+    cd ${S}
+    oe_runmake
+}
+do_install() {
+    cd ${S}
+    oe_runmake MAKEFLAGS='-j 1' install
+}
+FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/"
+RDEPENDS_${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs"
 RDEPENDS_${PN} += "python3-core python3-sip3"
diff --git a/recipes-python/pyqtchart/python-pyqtchart.inc b/recipes-python/pyqtchart/python-pyqtchart.inc
deleted file mode 100644
index e8dba18a..00000000
--- a/recipes-python/pyqtchart/python-pyqtchart.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-SUMMARY = "Python Qt Chart Bindings"
-AUTHOR = "Adrian.Fiergolski@fastree3d.com"
-SECTION = "devel/python"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "\
-    file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \
-"
-SRC_URI = "\
-    https://www.riverbankcomputing.com/static/Downloads/PyQtChart/${PV}/PyQtChart-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "d5d37bff46b690d6318e5e5f25dd5213"
-SRC_URI[sha256sum] = "49960a1483527857b38c1527f9b6328d30bdcc84521f579c0a561a892f54130e"
-S = "${WORKDIR}/PyQtChart-${PV}"
-inherit qmake5
-DEPENDS = "qtbase qtdeclarative qtquickcontrols2"
-export BUILD_SYS
-export HOST_SYS
-export STAGING_INCDIR
-export STAGING_LIBDIR
-PARALLEL_MAKEINST = ""
-DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager"
-DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
-do_configure_prepend() {
-    cd ${S}
-    echo "[PyQt 5]" > pyqt.cfg
-    echo "py_platform = linux" >> pyqt.cfg
-    echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg
-    echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg
-    echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg
-    echo "py_sip_dir = ${STAGING_EXECPREFIXDIR}/share/sip" >> pyqt.cfg
-    echo "sip_module = PyQt5.sip" >> pyqt.cfg
-    echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
-    echo yes | ${PYTHON} configure.py --verbose --qmake  ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST}
-}
-do_configure_append() {
-    #Fix installation paths
-    sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/Makefile
-    sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/QtChart/Makefile
-    #Skip installed.txt creation
-    sed -i -e s:" install_distinfo ":" ": ${S}/Makefile
-}
-do_compile() {
-    cd ${S}
-    oe_runmake
-}
-do_install() {
-    cd ${S}
-    oe_runmake MAKEFLAGS='-j 1' install
-}
-FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/"
-DEPENDS = "qtcharts"
-RDEPENDS_${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs qtcharts"
diff --git a/recipes-python/pyqtchart/python3-pyqtchart_5.13.1.bb b/recipes-python/pyqtchart/python3-pyqtchart_5.13.1.bb
index 899f9691..04e42beb 100644
--- a/recipes-python/pyqtchart/python3-pyqtchart_5.13.1.bb
+++ b/recipes-python/pyqtchart/python3-pyqtchart_5.13.1.bb
@@ -1,7 +1,66 @@
-require python-pyqtchart.inc
+SUMMARY = "Python Qt Chart Bindings"
+AUTHOR = "Adrian.Fiergolski@fastree3d.com"
+SECTION = "devel/python"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "\
+    file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \
+"
+SRC_URI = "\
+    https://www.riverbankcomputing.com/static/Downloads/PyQtChart/${PV}/PyQtChart-${PV}.tar.gz \
+"
+SRC_URI[md5sum] = "d5d37bff46b690d6318e5e5f25dd5213"
+SRC_URI[sha256sum] = "49960a1483527857b38c1527f9b6328d30bdcc84521f579c0a561a892f54130e"
+S = "${WORKDIR}/PyQtChart-${PV}"
+inherit qmake5
 inherit python3native python3-dir
+DEPENDS = "qtcharts"
 DEPENDS += "sip3 sip3-native python3 python3-pyqt5"
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
+PARALLEL_MAKEINST = ""
+DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager"
+do_configure_prepend() {
+    cd ${S}
+    echo "[PyQt 5]" > pyqt.cfg
+    echo "py_platform = linux" >> pyqt.cfg
+    echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg
+    echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg
+    echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg
+    echo "py_sip_dir = ${STAGING_EXECPREFIXDIR}/share/sip" >> pyqt.cfg
+    echo "sip_module = PyQt5.sip" >> pyqt.cfg
+    echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
+    echo yes | ${PYTHON} configure.py --verbose --qmake  ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST}
+}
+do_configure_append() {
+    #Fix installation paths
+    sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/Makefile
+    sed -i -e s:'$(INSTALL_ROOT)'${STAGING_EXECPREFIXDIR}:'$(INSTALL_ROOT)'${D}${exec_prefix}:g ${S}/QtChart/Makefile
+    #Skip installed.txt creation
+    sed -i -e s:" install_distinfo ":" ": ${S}/Makefile
+}
+do_compile() {
+    cd ${S}
+    oe_runmake
+}
+do_install() {
+    cd ${S}
+    oe_runmake MAKEFLAGS='-j 1' install
+}
+FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/"
+RDEPENDS_${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs qtcharts"
 RDEPENDS_${PN} += "python3-core python3-sip3 python3-pyqt5"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index a721b8ba..bf5f5d81 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.14-shared
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared
-# 5.14.meta-qt5-shared.2
+# 5.15.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,12 +41,13 @@ SRC_URI += "\
    file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
    file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
    file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
+    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
+    file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
 "
 # common for qtbase-native and nativesdk-qtbase
-# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native
-# 5.14.meta-qt5-native.2
+# 5.15.meta-qt5-native.1
 SRC_URI += " \
    file://0019-Always-build-uic-and-qvkgen.patch \
    file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \
@@ -67,6 +68,7 @@ FILES_${PN}-dev += " \
 FILES_${PN} += " \
    ${SDKPATHNATIVE}/environment-setup.d \
    ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_LIBS}/metatypes \
 "
 # qttools binaries are placed in a subdir of bin in order to avoid
@@ -151,8 +153,7 @@ do_install() {
    # remove things unused in nativesdk, we need the headers and libs
    rm -rf ${D}${datadir} \
           ${D}${libdir}/cmake \
-           ${D}${libdir}/pkgconfig \
+           ${D}${libdir}/pkgconfig
-           ${D}${libdir}/metatypes \
    # Install CMake's toolchain configuration
    mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index 3ed1b0e7..5b3097cd 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,4 +1,4 @@
-From 01c62d4e4bf1034302834fef48a894c6b0ebe147 Mon Sep 17 00:00:00 2001
+From 938dbe06407be1e918331cb629879b0bdf7d9eb4 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 17 Aug 2018 13:23:58 +0300
 Subject: [PATCH] Allow a tools-only build
@@ -10,7 +10,7 @@ Subject: [PATCH] Allow a tools-only build
 3 files changed, 9 insertions(+), 4 deletions(-)
 diff --git a/qt3d.pro b/qt3d.pro
-index c5232e116..88e5559c8 100644
+index c5232e116..cf5345352 100644
 --- a/qt3d.pro
 +++ b/qt3d.pro
 @@ -1,4 +1,4 @@
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 3b77b55b..f6cde878 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += "qtbase"
 DEPENDS_class-target += "qtdeclarative qt3d-native"
-# Patches from https://github.com/meta-qt5/qt3d/commits/b5.14
+# Patches from https://github.com/meta-qt5/qt3d/commits/b5.15
-# 5.14.meta-qt5.1
+# 5.15.meta-qt5.1
 SRC_URI += " \
    file://0001-Allow-a-tools-only-build.patch \
 "
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb
index 927f101f..e7cbfef8 100644
--- a/recipes-qt/qt5/qt5-creator_git.bb
+++ b/recipes-qt/qt5/qt5-creator_git.bb
@@ -12,9 +12,9 @@ LIC_FILES_CHKSUM = " \
    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
 "
-inherit qmake5
+inherit qmake5 mime-xdg
-DEPENDS = "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib"
+DEPENDS += "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib"
 DEPENDS_append_toolchain-clang = " clang llvm-common"
 DEPENDS_append_libc-musl = " libexecinfo"
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index c6d1ea71..94bbca39 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -128,13 +128,13 @@ FILES_${PN}-mkspecs = "\
 # modifications to normal packages
 FILES_${PN} += " \
+    ${OE_QMAKE_PATH_LIBS}/metatypes \
    ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBS} \
    ${OE_QMAKE_PATH_LIBEXECS} \
 "
 FILES_${PN}-dev += " \
    ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \
    ${OE_QMAKE_PATH_LIBS}/pkgconfig \
-    ${OE_QMAKE_PATH_LIBS}/metatypes \
    ${OE_QMAKE_PATH_LIBS}/cmake/* \
    ${OE_QMAKE_PATH_LIBS}/*.prl \
    ${OE_QMAKE_PATH_LIBS}/*.la \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 2817e739..02456b58 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.14-shared
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared
-# 5.14.meta-qt5-shared.2
+# 5.15.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 \
@@ -36,12 +36,13 @@ SRC_URI += "\
    file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
    file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
    file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
+    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
+    file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
 "
 # common for qtbase-native and nativesdk-qtbase
-# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native
-# 5.14.meta-qt5-native.2
+# 5.15.meta-qt5-native.1
 SRC_URI += " \
    file://0019-Always-build-uic-and-qvkgen.patch \
    file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \
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 95e236ae..872212f6 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 0d13aba5a2ab1794bfea5a3bbf2096da17f0cae1 Mon Sep 17 00:00:00 2001
+From 45fbe12b5cff5825e078f731c2e8e3d294b9a1d2 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
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 be51019d..7cbe46ed 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 8409ffc14e5176595c7d591ebd07f5b49af8d245 Mon Sep 17 00:00:00 2001
+From f05a53357489590c3cd8cd848a34f3aeb4bebe18 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,10 +19,10 @@ 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 9b672327ef..f0820b4f4e 100644
+index 4c1c3a612b..8b0f6b16ee 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
+@@ -8,7 +8,7 @@ if (NOT TARGET Qt5::qmake)
 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
     set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
 !!ELSE
@@ -31,7 +31,7 @@ index 9b672327ef..f0820b4f4e 100644
 !!ENDIF
     _qt5_Core_check_file_exists(${imported_location})
 
-@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc)
+@@ -23,7 +23,7 @@ if (NOT TARGET Qt5::moc)
 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
     set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
 !!ELSE
@@ -40,7 +40,7 @@ index 9b672327ef..f0820b4f4e 100644
 !!ENDIF
     _qt5_Core_check_file_exists(${imported_location})
 
-@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc)
+@@ -40,7 +40,7 @@ if (NOT TARGET Qt5::rcc)
 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
     set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
 !!ELSE
@@ -50,7 +50,7 @@ index 9b672327ef..f0820b4f4e 100644
     _qt5_Core_check_file_exists(${imported_location})
 
 diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
-index 1d947159e2..582c52169e 100644
+index a814678f7b..8546e4b4dc 100644
 --- a/src/dbus/Qt5DBusConfigExtras.cmake.in
 +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
 @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
@@ -72,7 +72,7 @@ index 1d947159e2..582c52169e 100644
     _qt5_DBus_check_file_exists(${imported_location})
 
 diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-index 99d87e2e46..8fe9b3c0b5 100644
+index 236d1d4159..f25a73a78b 100644
 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
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 6d8f5f96..3fb6bc87 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 73c6762cc7d4c3449fc152f706c8d0efa2f7e65e Mon Sep 17 00:00:00 2001
+From ea0973fb18ca76d292b3c7fb7a29be547f6d95e1 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,7 +20,7 @@ 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 f0f77fe68e..8ef04cb64f 100644
+index 835fea0c77..dea00e28b9 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
 @@ -183,7 +183,10 @@ void QLibrarySettings::load()
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 a40c0563..3a223c2c 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 fad25d26b6ec478d0b22bc4fbfec65a6665608c0 Mon Sep 17 00:00:00 2001
+From f83f21998ba43dcdb02de360ba9997f909c5d677 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 81c84b28ef..bf40b68835 100644
+index e775bf046e..a20eded987 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -872,10 +872,10 @@ defineTest(qtConfOutput_preparePaths) {
+@@ -876,10 +876,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 b8a0b716..e1536f40 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 24c469b3c9599aa106c44d1df48fb04db5b8c904 Mon Sep 17 00:00:00 2001
+From 6e0bfe33f74f4a24d7f4c9adb5b96ca6ae844308 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
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 95df5efd..b4f253e7 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 8143b5913e50d26ef39fbbed5f1e28ff74a57d20 Mon Sep 17 00:00:00 2001
+From 0a279228c6a3eb52e434aeb31504762dd29e2f5f 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 50364765fb..e101a2e841 100644
+index 4c3086a1f6..f330d28448 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 d683d4d9..a8161770 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 41d43606a50fbeae73d585ed727ec13e36f785c0 Mon Sep 17 00:00:00 2001
+From bc9aa54b9930635ddceb918bfc94871e2fc3d413 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 07110739..1dbb2855 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 4d8c0a0524ceea0590f15d87a4aa604a488bedc5 Mon Sep 17 00:00:00 2001
+From fbe7fd996b86c087d64864bcce154d382701ab6f 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 12c29a6e13..7d31799da6 100644
+index 19b3289390..4d0cdf8b5f 100644
 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 @@ -35,7 +35,7 @@
@@ -26,7 +26,7 @@ index 12c29a6e13..7d31799da6 100644
 #endif
 
 #include <algorithm>
-@@ -368,7 +368,7 @@ protected:
+@@ -369,7 +369,7 @@ protected:
             const char *nm = name.constData();
             int tp = qRegisterMetaType<Bar>(nm);
 #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
@@ -36,7 +36,7 @@ index 12c29a6e13..7d31799da6 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 0546c6ba7d..f602b035d6 100644
+index 099aa5fb51..c2d310458e 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 0546c6ba7d..f602b035d6 100644
 #endif
 
 #include "private/qhostinfo_p.h"
-@@ -2178,8 +2179,8 @@ public slots:
+@@ -2199,8 +2200,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 b30a823f..f5e21333 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 ba7dda9ef0e33103e26fee2e41f25d8c0e3bfb78 Mon Sep 17 00:00:00 2001
+From ed82988ac6aca8c6927211edefa4e548cc284dfd 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 e58b1ebc..a0b882ca 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 03e57f526db46b93b2bcbd01974446b9819e73e7 Mon Sep 17 00:00:00 2001
+From 1d03a7f53ca07ffcee37ec2a6606435c18585ce7 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 8a705415..f579cb5a 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 f3befb762f2e69fa1f8a444ca9b392b4cb48ba5f Mon Sep 17 00:00:00 2001
+From 146fcda8319f17e01af676ee4151d83f302c6d6e 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 8f434acb29..53dc0d9121 100644
+index ec85a6c5c6..15bf7d106f 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 5186c2d6..a35746c6 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 382e44787d366428892161881fdc3c2481cefc04 Mon Sep 17 00:00:00 2001
+From 3184d1f75e0312826efd1227519b46b5cb464299 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 aead581478..8e06a069b4 100644
+index 2499c8b6d8..2e79e083cd 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 aead581478..8e06a069b4 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 4d82321cba..0b03ec99a6 100644
+index 1f919d270a..adf3fead32 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 83f4e29c..fa348096 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 8a2c2006676b0cb1a579efabb0ab24a277024b54 Mon Sep 17 00:00:00 2001
+From bbf475d3c2415a78a8701bd3acaf69032721d597 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
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 f9993f51..59fd70b0 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 73b4276844b4fadc42375f713b51031b5c7c15b1 Mon Sep 17 00:00:00 2001
+From 44e4a803fd41ff975cdd6c90afa4be66396e14a4 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 71f4658f..dbad9cf6 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 3a147b314b96a3f2bd7ded41a9c5fe685985fa29 Mon Sep 17 00:00:00 2001
+From 54936e8ad2e9329edacc6e8150087d463c14fac4 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
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 a893d90d..138cbad3 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 90f1d71d609495ba305d052017df4d3fb801401c Mon Sep 17 00:00:00 2001
+From d45c22d639c58d20a15ffc70c28a00e800c12bf4 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/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
index b0de9c26..133c43bb 100644
--- a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
+++ b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
@@ -1,4 +1,4 @@
-From 54328b4942eb8cc884bdf41d58f2408a60ea7605 Mon Sep 17 00:00:00 2001
+From b9b6172194de411c2c68e81c427a79b0a1227e3e 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
@@ -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 c51db59e1f..1f3726e291 100644
+index 78728ef4ce..1d65f9b9f7 100644
 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
 +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
 @@ -58,6 +58,11 @@
@@ -59,7 +59,7 @@ index c51db59e1f..1f3726e291 100644
 #include <math.h>
 
 #if QT_CONFIG(mtdev)
-@@ -576,7 +581,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
+@@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
 
         // update timestamps
         m_lastTimeStamp = m_timeStamp;
diff --git a/recipes-qt/qt5/qtbase/0022-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
index 8aeca2ef..e9e29941 100644
--- a/recipes-qt/qt5/qtbase/0022-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
+++ b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
@@ -1,4 +1,4 @@
-From 9b192df7e06992b256eb49af5a213c1b0d3e341a Mon Sep 17 00:00:00 2001
+From f2da5661a2a8bc2037a4d40fd1db16522af6d7a8 Mon Sep 17 00:00:00 2001
 From: Nicola Lunghi <nick83ola@gmail.com>
 Date: Wed, 5 Feb 2020 15:32:25 +0000
 Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform
@@ -13,10 +13,10 @@ Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/2894
 1 file changed, 37 insertions(+), 13 deletions(-)
 diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
-index 6e48439944..3566ef24be 100644
+index 9eb62ceab2..211151876c 100644
 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
 +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
-@@ -2890,19 +2890,43 @@ void tst_QPainter::monoImages()
+@@ -2893,19 +2893,43 @@ void tst_QPainter::monoImages()
 #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__)
 #include <fenv.h>
 
@@ -67,7 +67,7 @@ index 6e48439944..3566ef24be 100644
         return QLatin1String("Invalid operation");
     return QLatin1String("No exception");
 }
-@@ -2928,7 +2952,7 @@ private:
+@@ -2931,7 +2955,7 @@ private:
 
 void fpe_rasterizeLine_task232012()
 {
@@ -76,7 +76,7 @@ index 6e48439944..3566ef24be 100644
     QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
     img.fill(0x0);
     QPainter p(&img);
-@@ -2940,7 +2964,7 @@ void fpe_rasterizeLine_task232012()
+@@ -2943,7 +2967,7 @@ void fpe_rasterizeLine_task232012()
 
 void fpe_pixmapTransform()
 {
@@ -85,7 +85,7 @@ index 6e48439944..3566ef24be 100644
 
     QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
 
-@@ -2968,7 +2992,7 @@ void fpe_pixmapTransform()
+@@ -2971,7 +2995,7 @@ void fpe_pixmapTransform()
 
 void fpe_zeroLengthLines()
 {
@@ -94,7 +94,7 @@ index 6e48439944..3566ef24be 100644
 
     QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
 
-@@ -2980,7 +3004,7 @@ void fpe_zeroLengthLines()
+@@ -2983,7 +3007,7 @@ void fpe_zeroLengthLines()
 
 void fpe_divByZero()
 {
@@ -103,7 +103,7 @@ index 6e48439944..3566ef24be 100644
 
     QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
 
-@@ -3003,7 +3027,7 @@ void fpe_divByZero()
+@@ -3006,7 +3030,7 @@ void fpe_divByZero()
 
 void fpe_steepSlopes()
 {
@@ -112,7 +112,7 @@ index 6e48439944..3566ef24be 100644
 
     QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied);
 
-@@ -3022,7 +3046,7 @@ void fpe_steepSlopes()
+@@ -3025,7 +3049,7 @@ void fpe_steepSlopes()
 
 void fpe_radialGradients()
 {
diff --git a/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch
index e7a6d67a..5d5a32d7 100644
--- a/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch
+++ b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch
@@ -1,4 +1,4 @@
-From 71089d2dbc2becf51e419741afb5f9e2028963e7 Mon Sep 17 00:00:00 2001
+From ecfccd0a25564555253f9f09fa6bed85973020a4 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,7 +14,7 @@ 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 8ff3ec4c1f..7a26fd3596 100644
+index 592f0cf644..e1cfc3901f 100644
 --- a/src/src.pro
 +++ b/src/src.pro
 @@ -235,7 +235,7 @@ qtConfig(gui) {
diff --git a/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch
index 4da126d9..aba0d502 100644
--- a/recipes-qt/qt5/qtbase/0020-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 cbf26740eca4972824e74acbb8ca5ccb3cdde9b7 Mon Sep 17 00:00:00 2001
+From f2324ba65bb667108a8ad2f08bc4e4b08253e38b 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,10 +24,10 @@ 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 c6f071bc3f..575c993e68 100644
+index b3daf43c04..e1df2ac580 100644
 --- a/src/corelib/global/qconfig-bootstrapped.h
 +++ b/src/corelib/global/qconfig-bootstrapped.h
-@@ -104,7 +104,7 @@
+@@ -107,7 +107,7 @@
 #define QT_FEATURE_process -1
 #define QT_FEATURE_regularexpression -1
 #ifdef __GLIBC_PREREQ
@@ -36,7 +36,7 @@ index c6f071bc3f..575c993e68 100644
 #else
 # define QT_FEATURE_renameat2 -1
 #endif
-@@ -112,7 +112,7 @@
+@@ -115,7 +115,7 @@
 #define QT_FEATURE_signaling_nan -1
 #define QT_FEATURE_slog2 -1
 #ifdef __GLIBC_PREREQ
@@ -46,10 +46,10 @@ index c6f071bc3f..575c993e68 100644
 # define QT_FEATURE_statx -1
 #endif
 diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
-index 38cb6a423d..b6d5e16464 100644
+index eaf4e2d9af..63f2f8ecb3 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
+@@ -1435,16 +1435,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
     Q_CHECK_FILE_NAME(srcPath, false);
     Q_CHECK_FILE_NAME(tgtPath, false);
 
diff --git a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch
index dae48d59..68193991 100644
--- a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch
+++ b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch
@@ -1,4 +1,4 @@
-From 61a5dc7d949bc0f8ff3c4a1060c91c61187e5fb2 Mon Sep 17 00:00:00 2001
+From 6d2382ba56e9d2362ff3572356911f3ef1d6eaef 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 575c993e68..d0c9fdfce3 100644
+index e1df2ac580..151cc1d2c2 100644
 --- a/src/corelib/global/qconfig-bootstrapped.h
 +++ b/src/corelib/global/qconfig-bootstrapped.h
-@@ -95,7 +95,7 @@
+@@ -98,7 +98,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 cba86c63..67c1ef19 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.14-shared
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared
-# 5.14.meta-qt5-shared.2
+# 5.15.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 \
@@ -32,8 +32,8 @@ SRC_URI += "\
    file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
    file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
    file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
+    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
-    file://0022-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
+    file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
 "
 # for syncqt
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 7f1709e0..1a4c57af 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += "qtdeclarative"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
+PACKAGECONFIG ??= "gstreamer \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
                   ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
 PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib"
 PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio"
@@ -38,3 +39,9 @@ SRC_URI += "\
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 SRCREV = "d0e0119251288c9c7224c5c6797a1377032aac2f"
+# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
+do_install_append() {
+    install -d ${D}${OE_QMAKE_PATH_PLUGINS}/videoeglvideonode
+}
+FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/videoeglvideonode"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index f59e497c..67c7bef8 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = " \
 "
 DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
-ASSIMP_BRANCH = "assimp_5.0_release"
 SRC_URI += " \
-    git://github.com/assimp/assimp.git;name=assimp;branch=${ASSIMP_BRANCH};protocol=https;destsuffix=git/src/3rdparty/assimp/src \
+    git://github.com/assimp/assimp.git;name=assimp;branch=assimp_5.0_release;protocol=https;destsuffix=git/src/3rdparty/assimp/src \
 "
 PACKAGECONFIG ??= ""
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 a1298f36..c3597eaf 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 fe603fbecb5731febc392b51bbbee1090be243d6 Mon Sep 17 00:00:00 2001
+From e4a6ca9bf08383ec3c271746edc9e970f4cd2412 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,10 +19,10 @@ 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 ee08f81b..297a6862 100644
+index 2aa345c2..a55dc128 100644
 --- a/src/buildtools/config/linux.pri
 +++ b/src/buildtools/config/linux.pri
-@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") {
+@@ -122,7 +122,7 @@ contains(QT_ARCH, "mips") {
 
 host_build {
     gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
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 ea536aff..57c0afa2 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 9f996977ebbb894aa321240cb5590bdae27f14a5 Mon Sep 17 00:00:00 2001
+From e4f1790fd91b5d214b5a524575d815530a587ac2 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 a2dce542..baf62462 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 7ed387e99975dc25ced3496c7dd98411f11d28e2 Mon Sep 17 00:00:00 2001
+From 15a79d185bf9b275ae0eb09041758021a178774f 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 4b9268e1..be04b160 100644
+index d7e2ab8d..6864a8e6 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
index 8f25c687..e7377cfc 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 cde19c7f959ff4ea0d2aa202b9c7a048d3c7200e Mon Sep 17 00:00:00 2001
+From e6a216265bf68f600682c7d27a2542c4f385e085 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
@@ -9,10 +9,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 5 deletions(-)
 diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
-index 5bdd808d..19540787 100644
+index 8077b12f..aaf4db47 100644
 --- a/src/buildtools/config/support.pri
 +++ b/src/buildtools/config/support.pri
-@@ -89,11 +89,6 @@ defineTest(qtwebengine_checkErrorForLinux) {
+@@ -97,11 +97,6 @@ defineTest(qtwebengine_checkErrorForLinux) {
         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 ff2cf2ed..8e008832 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 8dc7d83d58f6f036d021ed27dd05322b654e21bf Mon Sep 17 00:00:00 2001
+From af441fca2705c866fe9d6699dd2ddc388a5412e2 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
@@ -18,10 +18,10 @@ Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
 1 file changed, 9 insertions(+)
 diff --git a/gn/tools/gn/ninja_action_target_writer.cc b/gn/tools/gn/ninja_action_target_writer.cc
-index 7e945c0de0e..3deb587668c 100644
+index 5f4fbaad882..1c074a2193b 100644
 --- a/gn/tools/gn/ninja_action_target_writer.cc
 +++ b/gn/tools/gn/ninja_action_target_writer.cc
-@@ -118,9 +118,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
+@@ -119,9 +119,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
     // strictly necessary for regular one-shot actions, but it's easier to
     // just always define unique_name.
     std::string rspfile = custom_rule_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 e2e86212..3c211ca4 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 dcc7962a9e9eb8fc10728df0b72e91794d1ee9d9 Mon Sep 17 00:00:00 2001
+From 1f4c9aaaa625ed6c4a84eed9bed143de056d3535 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
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 55f61d03..0171a5dd 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 e44d59aff5c23049ed765d872b167c27f9d2be23 Mon Sep 17 00:00:00 2001
+From e590e511b89a08867a801cb20e4e98787cb36e78 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 2 Feb 2019 19:28:59 -0800
 Subject: [PATCH] chromium: fix build with clang
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 2 insertions(+), 25 deletions(-)
 diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
-index be485fd89b9..7179df05451 100644
+index ab47e2b98f8..f5ac335af90 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -773,8 +773,6 @@ config("compiler_cpu_abi") {
+@@ -774,8 +774,6 @@ config("compiler_cpu_abi") {
       }
     } else if (current_cpu == "arm") {
       if (is_clang && !is_android && !is_nacl) {
@@ -22,7 +22,7 @@ index be485fd89b9..7179df05451 100644
       }
       if (!is_nacl) {
         cflags += [
-@@ -787,8 +785,6 @@ config("compiler_cpu_abi") {
+@@ -788,8 +786,6 @@ config("compiler_cpu_abi") {
       }
     } else if (current_cpu == "arm64") {
       if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -31,7 +31,7 @@ index be485fd89b9..7179df05451 100644
       }
     } else if (current_cpu == "mipsel" && !is_nacl) {
       ldflags += [ "-Wl,--hash-style=sysv" ]
-@@ -797,9 +793,6 @@ config("compiler_cpu_abi") {
+@@ -798,9 +794,6 @@ config("compiler_cpu_abi") {
           if (is_android) {
             cflags += [ "--target=mipsel-linux-android" ]
             ldflags += [ "--target=mipsel-linux-android" ]
@@ -41,7 +41,7 @@ index be485fd89b9..7179df05451 100644
           }
         } else {
           cflags += [ "-EL" ]
-@@ -878,10 +871,7 @@ config("compiler_cpu_abi") {
+@@ -879,10 +872,7 @@ config("compiler_cpu_abi") {
     } else if (current_cpu == "mips" && !is_nacl) {
       ldflags += [ "-Wl,--hash-style=sysv" ]
       if (custom_toolchain == "") {
@@ -53,7 +53,7 @@ index be485fd89b9..7179df05451 100644
           cflags += [ "-EB" ]
           ldflags += [ "-EB" ]
         }
-@@ -928,9 +918,6 @@ config("compiler_cpu_abi") {
+@@ -929,9 +919,6 @@ config("compiler_cpu_abi") {
           if (is_android) {
             cflags += [ "--target=mips64el-linux-android" ]
             ldflags += [ "--target=mips64el-linux-android" ]
@@ -63,7 +63,7 @@ index be485fd89b9..7179df05451 100644
           }
         } else {
           cflags += [
-@@ -987,10 +974,7 @@ config("compiler_cpu_abi") {
+@@ -988,10 +975,7 @@ config("compiler_cpu_abi") {
     } else if (current_cpu == "mips64") {
       ldflags += [ "-Wl,--hash-style=sysv" ]
       if (custom_toolchain == "") {
@@ -75,7 +75,7 @@ index be485fd89b9..7179df05451 100644
           cflags += [
             "-EB",
             "-mabi=64",
-@@ -1169,13 +1153,6 @@ config("compiler_deterministic") {
+@@ -1160,13 +1144,6 @@ config("compiler_deterministic") {
       }
     }
   }
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 e5c1dcbd..bed1c564 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 fc3765e4f2f8cff17a13736085a402425696e6e7 Mon Sep 17 00:00:00 2001
+From ab04dfceba3db888c5e8d6416668850dc0bb677e 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 29dda54ac20..6870dbb9f08 100644
+index cd9fed01e5a..42070dd80fa 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 c9df775d..0e8e3bf4 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 998a4037e9c057c9735d8b0df57c2eca5b452d0b Mon Sep 17 00:00:00 2001
+From 097b6df14e56a9bd800a277d65e117fec96372a0 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 7179df05451..884c9714bbb 100644
+index f5ac335af90..70b352f1ed1 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -774,15 +774,6 @@ config("compiler_cpu_abi") {
+@@ -775,15 +775,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 6a659ae9..6884d101 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 2ce7742c9dfde9ccbf2ede0db6359beb18c49189 Mon Sep 17 00:00:00 2001
+From dcb8f604a55c9d255102b8939dae1d5464398892 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,10 +28,10 @@ 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 b59506dcd6d..b8f22c948c0 100644
+index 7322807095f..0d6f981e895 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) {
+@@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) {
 }
 
 SI F from_half(U16 h) {
@@ -46,7 +46,7 @@ index b59506dcd6d..b8f22c948c0 100644
     return _mm256_cvtph_ps(h);
 
 #else
-@@ -995,14 +989,7 @@ SI F from_half(U16 h) {
+@@ -1009,14 +1003,7 @@ SI F from_half(U16 h) {
 }
 
 SI U16 to_half(F f) {
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 aeb496bd..507f8b8b 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 a0bd9300aa9c405216f504d602c7dd8d5b35eb21 Mon Sep 17 00:00:00 2001
+From da4adf97a2ee92a058f6f04a406d6447d05a657a 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
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 59b37719..7485a896 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 b0d3cfec7837dcf818c08454a16eb44d78337a9f Mon Sep 17 00:00:00 2001
+From c24673923fca116df3bf59f19f8c668973f77e4d 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
@@ -18,7 +18,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 4 files changed, 15 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 5684f4121be..10f6357e6b5 100644
+index 9f27d39e209..f565dd2ce5c 100644
 --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
 +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
 @@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback(
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 1f4a7c14..9f8caba7 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 ef41260060293cf53c279b675c470341fd635a4e Mon Sep 17 00:00:00 2001
+From 9a4797b32a3a3014bb9cd9811a755185a738b59b 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 352e553b..c2a0338c 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 d47414a793f9c1bf1eb01fd3a723b2bc871037de Mon Sep 17 00:00:00 2001
+From 046704d6ac338b548a85dc1f7af5810276175a9f 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 32dde335..fa382f9d 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 c2ca4923d5e534789b205968eb01779a90ec1299 Mon Sep 17 00:00:00 2001
+From 905c5b699f97105029a498096b3b6b3c8736cfeb 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>
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 3 files changed, 3 insertions(+)
 diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
-index 3f220da8c71..c54e3bb7d30 100644
+index dbe59ba5ea7..5216cfe3ee9 100644
 --- a/chromium/media/cdm/supported_cdm_versions.h
 +++ b/chromium/media/cdm/supported_cdm_versions.h
 @@ -6,6 +6,7 @@
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 3bf0c5eb..225e7157 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 5b4b896c1c6c79cc7c870a398acf1baf4b6bec7b Mon Sep 17 00:00:00 2001
+From bf8381f35e8f4aeac0cbdb9b4a960bccf259f69c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 1 Feb 2020 12:17:23 -0800
 Subject: [PATCH] chromium: Link v8 with libatomic on x86
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn
-index e21400265dd..7e56609b9da 100644
+index 426d83b4561..501e78d793c 100644
 --- a/chromium/v8/BUILD.gn
 +++ b/chromium/v8/BUILD.gn
-@@ -3310,7 +3310,8 @@ v8_source_set("v8_base_without_compiler") {
+@@ -3405,7 +3405,8 @@ v8_source_set("v8_base_without_compiler") {
   if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" ||
       v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" ||
       v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" ||
@@ -27,6 +27,3 @@ index e21400265dd..7e56609b9da 100644
     libs = [ "atomic" ]
   }
 
-- 
-2.25.0
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-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 3e595591..0e5b2b22 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-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 d38a63908f5c49705abd85bd9c2aee0ec334221d Mon Sep 17 00:00:00 2001
+From fbd1beb51ff1da1fba180f7f0ca239975d47276b 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/0012-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 bd16cee2..ef12eec3 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-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 37648db3a564bc4bdcecfc2a38bc21d45875088e Mon Sep 17 00:00:00 2001
+From b941a200af8547946255c383b29c3f7b68598a75 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/0013-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 05576b02..3de13d9a 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0013-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 e087d26af9bdd2f045f8a81fdd2688c50b77e938 Mon Sep 17 00:00:00 2001
+From 35c208fa2c7f8f189b8125b16fca8356d88920a7 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/0014-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 ad7a085f..9308ef78 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-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 5cde4d2fb5affc6e739dba412453b4bf076f19e9 Mon Sep 17 00:00:00 2001
+From 5134d082447b67b2459ee1e84f4aa2ee3937b19a 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/0015-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch
index c5667e9d..c5b4b457 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0015-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 b6ef8cafefad7082fd681ff8386835d7bebdb38c Mon Sep 17 00:00:00 2001
+From b80a61e044cd4cca307cbe706684e7136fd79601 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/0016-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 facc53d9..3e2c8ddd 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0016-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 2502151f355d0cc9d1c3681958df73c35010c145 Mon Sep 17 00:00:00 2001
+From 854c9b6e21e2afaeb427c32ba57eee870f45e817 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/0017-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 b611781b..1236555d 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0017-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 b8735496287b7c2a15224f7d837dc74a09434bdb Mon Sep 17 00:00:00 2001
+From bdbf26f52d06dbc61ad934f14ac0bbb036a96a39 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/0018-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 4b531624..d6671065 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0018-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 09c0c63a65770465ef2ec0a3b028e22a9a0164f6 Mon Sep 17 00:00:00 2001
+From 9604eab855a715b2ab30109f227d75269e3f2001 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 ee2d5721425..bcb83b07f6e 100644
+index 2e0f06b0c1e..aaafef77d79 100644
 --- a/chromium/net/dns/dns_config_service_posix.cc
 +++ b/chromium/net/dns/dns_config_service_posix.cc
 @@ -29,6 +29,10 @@
@@ -28,7 +28,7 @@ index ee2d5721425..bcb83b07f6e 100644
 #include "net/dns/dns_config_watcher_mac.h"
 #endif
 diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc
-index 03e248c9878..9ccda82c7e9 100644
+index 1c014a65019..2670a827aa5 100644
 --- a/chromium/net/dns/dns_reloader.cc
 +++ b/chromium/net/dns/dns_reloader.cc
 @@ -9,6 +9,10 @@
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-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 b20456b0..a0208998 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0019-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 57ebdf59c45c70ab13b724a2293fdd78241a8a37 Mon Sep 17 00:00:00 2001
+From 45b236215d3c082b30c8d68421c65828415d85f2 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/0020-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
index 62b9531b..f9bbc1c2 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0020-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 50d5b6fa29696c873830af7632b51cb4836c2210 Mon Sep 17 00:00:00 2001
+From e9bab0dfd2bd66ad883d5e67e7b2ffca7a12bfff 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/0021-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 7ed278b0..f7a0ec04 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0021-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 1f839bf6ac48d81a8acbf3def4f57a555a05fa18 Mon Sep 17 00:00:00 2001
+From 871e56119bdf17db727572ab18f31f0671c5a315 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/0022-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 34761950..f502b74e 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0022-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 8f16cec0583c9de1ceb2c34a3bea527096f34075 Mon Sep 17 00:00:00 2001
+From 3014e7511b95d88d5b1bf2ab860e54acf2f0dc09 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/0023-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
index 631ae8a0..ee5ca7d1 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
@@ -1,4 +1,4 @@
-From 725941687b118b90904fbc7e6b25a288b9d3c52b Mon Sep 17 00:00:00 2001
+From 3a243b9e35dadac30cff5ee2efd2917818eda177 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
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 0595e7f2..9dad8adc 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -144,8 +144,8 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "79-based"
-# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.14
+# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15
-# 5.14.meta-qt5.2
+# 5.15.meta-qt5.4
 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/77-based
+# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/79-based
-# 77-based.meta-qt5.2
+# 79-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 \
@@ -174,19 +174,19 @@ SRC_URI += " \
 "
 SRC_URI_append_libc-musl = "\
-    file://chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
+    file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
-    file://chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
+    file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
-    file://chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
+    file://chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
-    file://chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
+    file://chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
-    file://chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
+    file://chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
-    file://chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
+    file://chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
-    file://chromium/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
+    file://chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
-    file://chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
+    file://chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
-    file://chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
+    file://chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
-    file://chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
+    file://chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
-    file://chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
+    file://chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
-    file://chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
+    file://chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
-    file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
+    file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
 "
 SRCREV_qtwebengine = "3394cde4e89463ba49af379b89863c7731c4b4ac"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 998fbb6d..cccc0957 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,9 +19,8 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
 COMPATIBLE_MACHINE_armv7ve = "(.*)"
 COMPATIBLE_MACHINE_aarch64 = "(.*)"
-SRCREV = "c6d4bb78fe59a55ffce526ff951e5c5270dd92cf"
 python() {
    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
 }
+SRCREV = "c6d4bb78fe59a55ffce526ff951e5c5270dd92cf"
author	Mikko Gronoff <mikko.gronoff@qt.io>	2020-04-14 10:42:58 +0300
committer	Mikko Gronoff <mikko.gronoff@qt.io>	2020-04-15 08:19:56 +0300
commit	7de0cbd5dc9f80972ce559c9e340afbff0b9403d (patch)
tree	a7011b9b55ba590406919a1873d01c20aea5d0ea
parent	374abadf749bbf8f3d84e2e895c2139722447a01 (diff)
parent	02930760c8be7c9d850919cda89469e9c0120d6c (diff)
download	meta-qt5-7de0cbd5dc9f80972ce559c9e340afbff0b9403d.tar.gz