meta-qt5: Update to 5.9.2 release

Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
2026-09-10 08:04:45 +02:00 · 2017-10-12 14:13:05 +02:00
parent 2c3ef00f53
commit bbb3044569
43 changed files with 76 additions and 139 deletions
--- a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch
+++ b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch
@@ -1,22 +1,23 @@
-From 46b6456bc8995b8d6249fb008a538222d30716cd Mon Sep 17 00:00:00 2001
+From 827b323ee9a6db04c1f5b644abea0ced2095096a Mon Sep 17 00:00:00 2001
 From: Christophe Chapuis <chris.chapuis@gmail.com>
 Date: Tue, 26 Jan 2016 18:56:42 +0100
 Subject: [PATCH] Don't use MeeGo as prefix in order to make this a common
 component

 Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
+Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
 ---
- plugin/components.h | 2 +-
- plugin/plugin.pro   | 2 +-
- plugin/qmldir       | 2 +-
+ plugin/plugin.cpp | 2 +-
+ plugin/plugin.pro | 2 +-
+ plugin/qmldir     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

-diff --git a/plugin/components.h b/plugin/components.h
-index d4f2bcd..49b7ac2 100644
--- a/plugin/components.h
-+++ b/plugin/components.h
-@@ -17,7 +17,7 @@
- class Components : public QQmlExtensionPlugin
+diff --git a/plugin/plugin.cpp b/plugin/plugin.cpp
+index a383482..451c95f 100644
+--- a/plugin/plugin.cpp
+++ b/plugin/plugin.cpp
+@@ -24,7 +24,7 @@
+ class ConnmanPlugin: public QQmlExtensionPlugin
 {
     Q_OBJECT
 -    Q_PLUGIN_METADATA(IID "MeeGo.Connman")
@@ -25,7 +26,7 @@ index d4f2bcd..49b7ac2 100644
 public:
     void registerTypes(const char *uri);
 diff --git a/plugin/plugin.pro b/plugin/plugin.pro
-index 31d9076..da47ad9 100644
+index c4f54cf..3763f57 100644
 --- a/plugin/plugin.pro
 +++ b/plugin/plugin.pro
@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX)
@@ -46,5 +47,5 @@ index 5db82b7..de56688 100644
 +module Connman
 plugin ConnmanQtDeclarative
 -- 
-1.8.1.2
+2.11.0.windows.3

--- a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
+++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
@@ -5,9 +5,9 @@ HOMEPAGE = "https://git.merproject.org/mer-core/libconnman-qt"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
 DEPENDS += "qtbase qtdeclarative"
-PV = "1.1.10+git${SRCPV}"
+PV = "1.2.4+git${SRCPV}"

-SRCREV = "4d6def3053eaccaac04e4f9e03ee24dea8b9e8d8"
+SRCREV = "9d98e12ed60ae4fa9da62485cb8a82129ed1a464"
 SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \
    file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \
 "
--- a/recipes-connectivity/libqofono/libqofono_git.bb
+++ b/recipes-connectivity/libqofono/libqofono_git.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"

 DEPENDS += "qtbase qtdeclarative"

-SRCREV = "54435de3bed0b454ef4ea3ea32c7234fcd9f24c6"
+SRCREV = "6916cd030b05f0bd137ea9b669fee48f20c19084"
 SRC_URI = "git://git.merproject.org/mer-core/libqofono.git"
 S = "${WORKDIR}/git"

-PV = "0.87+gitr${SRCPV}"
+PV = "0.92+gitr${SRCPV}"

 inherit qmake5

--- a/recipes-qt/examples/qt5everywheredemo_1.0.bb
+++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb
@@ -1,12 +1,12 @@
 SUMMARY = "Qt5 everywhere demo"
 DESCRIPTION = "Quick tour of Qt 5.0, primarily focusing on its graphical capabilities."
+LICENSE = "BSD"
 HOMEPAGE = "https://qt.gitorious.org/qt-labs"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://main.cpp;md5=1187cb795a0f96bce64e63dd1a67dc2b"
+LIC_FILES_CHKSUM = "file://qml/QtDemo/main.qml;endline=39;md5=7d80863906a4bc8ffca77fd869e335a9"

-DEPENDS = "qtdeclarative qtgraphicaleffects"
+DEPENDS = "qtdeclarative qtgraphicaleffects qtsvg qtmultimedia"

-SRCREV = "c17fe9e0ec0882ac4c4dc1168095f569acab5d09"
+SRCREV = "35d72a2eba7456a2efc5eb8b77afbc00f69ba0ac"
 SRC_URI = "${QT_LABS_GIT}/qt-labs-qt5-everywhere-demo"

 S = "${WORKDIR}/git/QtDemo"
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -37,6 +37,6 @@ do_configure_prepend() {
         ${S}/src/quick3d/imports/input/importsinput.pro
 }

-SRCREV = "9d8c9ada161ad97634992c444196add0abb4f9d1"
+SRCREV = "143b721249af92fc27f48fb01914195516f7a087"

 BBCLASSEXTEND += "native nativesdk"
--- a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb
+++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
    file://evdevmousehandler.cpp;beginline=1;endline=40;md5=9081062f6e7f74b6e62ad7ecee4a71be \
 "

-PV = "1.1.3+gitr${SRCPV}"
+PV = "1.1.4+gitr${SRCPV}"

 DEPENDS = "qtbase"

@@ -17,7 +17,7 @@ DEPENDS = "qtbase"
 CXXFLAGS += "-Wno-narrowing"

 SRC_URI = "git://github.com/nemomobile/qt5-plugin-generic-vboxtouch.git"
-SRCREV = "d613ad1cc64d7a6a9b38df4d49146170be6876aa"
+SRCREV = "3f2bdb5a1d346f02d5ab185522271ba2288a42bb"
 S = "${WORKDIR}/git/vboxtouch"

 inherit qmake5
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -125,4 +125,4 @@ do_install() {
    echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
 }

-SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
+SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0"
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -228,4 +228,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"

 RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"

-SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
+SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0"
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS = "qtdeclarative"

-SRCREV = "25447e889dc43c0831100bee1625a6f667d364cf"
+SRCREV = "a1aee8ecbefb74cd5eae380ced56bb43ff3cc40b"
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,4 +8,8 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtdeclarative qtmultimedia"

-SRCREV = "1f47b1a7ae58702dccc57a9ccbaa905441f4fecb"
+SRCREV = "e3af14e9169207e0e73f7e50191106895c29ddc4"
+
+# The same issue as in qtbase:
+# http://errors.yoctoproject.org/Errors/Details/152641/
+LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"

 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"

-SRCREV = "94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4"
+SRCREV = "6b3bdb84406b42b50bdf5a39ee9ca2fabd3e6d2f"
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"

-SRCREV = "3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f"
+SRCREV = "8329a8fb287094012989b965604ff9c9426f022a"
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() {

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

-SRCREV = "7c45b035b97ce705d536932965673dca7cfa489e"
+SRCREV = "32218c3243fb4f0da83293c5bd6a663d8e3660ee"

 BBCLASSEXTEND =+ "native nativesdk"
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += "qtbase qtdeclarative qtxmlpatterns"

 QT_MODULE_BRANCH = "dev"
-SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d"
+SRCREV = "23603a3b088178d8ec92fddb240e5a5c55d77d5a"
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"

 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"

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

-SRCREV = "b6ff12df5496f3d296bb438ae343d5f771e93fec"
+SRCREV = "1f6658cbaa5ffecbf9ba845ea81683dd2215cd34"
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"

 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"

-SRCREV = "144a3535db9f95e60972d3c3b6eaceb65a604577"
+SRCREV = "dc6dc3b088d1828ee6d31f92528e0c87272ad4ed"
--- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
+++ b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
@@ -1,27 +0,0 @@
-From dbc899b088817cf6529d7e5cb8be7a6a95556127 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 7 Jun 2017 13:29:29 +0300
-Subject: [PATCH] Make mapbox-gl build configurable
-
-mapbox-gl-native won't compile for ARMv5 or older, so disable the
-build by default.
-
-Task-number: QTBUG-61289
-Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b
---
- src/plugins/geoservices/geoservices.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
-index 459897a8..d97e05d0 100644
--- a/src/plugins/geoservices/geoservices.pro
-+++ b/src/plugins/geoservices/geoservices.pro
-@@ -6,7 +6,7 @@ qtConfig(concurrent) {
-     SUBDIRS += osm
- }
- 
-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
-+mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
-     !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
-         warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
-     } else {
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -13,10 +13,6 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"

-# Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9
-# 5.9.meta-qt5.2
-SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch"
-
 PACKAGECONFIG ??= ""
 # older geoclue 0.12.99 is needed
 PACKAGECONFIG[geoclue] = ",,geoclue"
@@ -34,7 +30,7 @@ SRC_URI += " \
    ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
 "

-SRCREV_qtlocation = "c832af789766fcebd8cfb15e53ce14f36278ca6d"
-SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b"
+SRCREV_qtlocation = "d919f47308b209c798e50d8ca1b9abd48ba94718"
+SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead"

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

-SRCREV = "343e281f0e7cc7fd9e1558e4d92f5019fa565181"
+SRCREV = "1e2702e86dbd2b3de69c58438bcfcf6276124547"
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc

 DEPENDS += "qtbase"

-SRCREV = "3d93f6436596e349e43c3798b675af66db71df8a"
+SRCREV = "47b80ecae6fe0b9a2c74f0b0feb243145695995e"
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtdeclarative"

-SRCREV = "63f2f55462f2f040cfe175ada8aa1e01168597fc"
+SRCREV = "871d8e8e2faca0be870930d83f755a2ad484d30b"
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -28,4 +28,4 @@ SRC_URI += " \
    file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
 "

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

-SRCREV = "86ee61734e0331459f9cfeb1ad56f773b7e994be"
+SRCREV = "08b74f4f30c304b80249a593a572808bc1892f66"
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc

 DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"

-SRCREV = "a1dff1a11ad303a1f82f181e6386194de90ec08f"
+SRCREV = "3caae998c8c1770cd96cadba24d89a60005c5fe7"

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

 DEPENDS += "qtbase qtdeclarative"

-SRCREV = "1673dbed00ba68209b6de95981f1e3b4a2a24682"
+SRCREV = "c273f2e5c82a3ef8e55e360988b8cf31362e2ba9"
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtserialport"

-SRCREV = "1d37c357c843a2622d2af7e1684576e19a8c7c30"
+SRCREV = "ce5a3ced5eeefe05675736d3279d4d45bbb6df90"
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase"

-SRCREV = "93b539140c06da07d330c9ecad67ab5ed3f9b0c8"
+SRCREV = "cb9ade8beabd3cdcd469a45fa82a27fcc960532f"
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase"

-SRCREV = "0fcd0160662941a9ba800b36671e88d82790bd95"
+SRCREV = "bdcd7a97449502f92069d36196cc81064b1c02a0"
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -30,4 +30,4 @@ do_install_append() {

 QT_MODULE_BRANCH = "dev"

-SRCREV = "f364358a817ba57fa5aa9c67e731241249e704f8"
+SRCREV = "9c204e05ae7fefe9525b30238b469b1bb65d2537"
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -31,7 +31,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"

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

-SRCREV = "fdc5749b5603653c5d0c59db267f44fd1609457e"
+SRCREV = "90a701032ec5c8898e33b4fb4df0480634caaf8d"

 BBCLASSEXTEND = "native nativesdk"

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

 DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"

-SRCREV = "dd8c39ea9312ec1441b3fdd830f9d42fe3258b58"
+SRCREV = "87218c4e68c4ebde8f5765f0dfe9a70a359ae05f"
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature

 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"

-SRCREV = "7f70da6a644bc5b690066f0ab4814e1358f57e81"
+SRCREV = "d483ed2927cb8d4685d5d3c7ea1c71246381910b"

 # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
 # 5.9.meta-qt5.2
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtdeclarative qtwebsockets"

-SRCREV = "b5229df6a08a902b11a2fc9529af6385f4d985d5"
+SRCREV = "61a638663c9061d7211849d3a9316661733a5ad9"
--- a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch
@@ -1,25 +0,0 @@
-From 331de4be615b8552e498ac2f3deff4b49b4b0fc0 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 20 Aug 2017 20:37:38 +0200
-Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree
-
-* as cfree man says:
-  This  function  should  never  be used.  Use free(3) instead.
-  Starting with version 2.26, it has been removed from glibc.
---
- src/core/api/qtbug-61521.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp
-index 86d5998e..1dcc4cfa 100644
--- a/src/core/api/qtbug-61521.cpp
-+++ b/src/core/api/qtbug-61521.cpp
-@@ -100,7 +100,7 @@ SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) {
- }
- 
- SHIM_HIDDEN void ShimCFree(void* ptr) {
-    cfree(ptr);
-+    free(ptr);
- }
- 
- SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) {
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -137,7 +137,6 @@ SRC_URI += " \
    file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
    file://0003-Include-dependency-to-QCoreApplication-translate.patch \
    file://0004-Force-host-toolchain-configuration.patch \
-    file://0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch \
 "

 # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 
@@ -164,8 +163,8 @@ SRC_URI_append_libc-musl = "\
    file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
 "

-SRCREV_qtwebengine = "99f84ffd2c0c78014a24534a863aa1c755abd51c"
-SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9"
+SRCREV_qtwebengine = "c11c2c8981e647c1eb2c6753ce77d436b92fff87"
+SRCREV_chromium = "cfe8c60903b327ac94406661350f4ac05aa8c21b"
 SRCREV = "${SRCREV_qtwebengine}"

 SRCREV_FORMAT = "qtwebengine_chromium"
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase qtdeclarative"

-SRCREV = "fb71c823a7ae823345518ca33ccfe273fcf76494"
+SRCREV = "492981b93295f575ad77b6767dc5b8851287aa2e"
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
 COMPATIBLE_MACHINE_armv7ve = "(.*)"
 COMPATIBLE_MACHINE_aarch64 = "(.*)"

-SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d"
+SRCREV = "ec640efd1d82cdc88157159cbaa048815696ee25"
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase"

-SRCREV = "f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8"
+SRCREV = "160435b0eb076c31a021004eeede143fc265bce4"
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = " \

 DEPENDS += "qtbase"

-SRCREV = "fcfa824402bb4edaf644fad786dac3560c743ebe"
+SRCREV = "8d7e1e0ec06724a4d332c050e9260530c708e773"

 BBCLASSEXTEND =+ "native nativesdk"

--- a/recipes-qt/qtchooser/qtchooser_git.bb
+++ b/recipes-qt/qtchooser/qtchooser_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Wrapper to select between Qt development binary versions"
 HOMEPAGE = "http://macieira.org/qtchooser"
 LICENSE = "LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | GPL-3.0"
-SRC_URI = "git://code.qt.io/qt/qtchooser.git;branch=master \
+SRC_URI = "git://code.qt.io/cgit/qtsdk/qtchooser.git;branch=master \
           file://0001-Makefile-install-the-man-dir.patch"

 LIC_FILES_CHKSUM = " \
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = " \
    file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
 "
 S = "${WORKDIR}/git"
-SRCREV = "4717841185d34bbe450e3b24445f2d35e3325a6a"
-PV = "39+git${SRCREV}"
+SRCREV = "a1b6736e4f2daf86cd1626004d40ef57db85fbb5"
+#PV = "39+git${SRCREV}"

 inherit pkgconfig

--- a/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch
+++ b/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch
@@ -1,42 +1,31 @@
-From 878c5a2a47d620f36dd281d4b0eb6677a8a1fbd4 Mon Sep 17 00:00:00 2001
+From d8c16e032a6b639b410761a07f2158e0aeda0b08 Mon Sep 17 00:00:00 2001
 From: Otavio Salvador <otavio@ossystems.com.br>
 Date: Sat, 7 Jun 2014 18:13:14 -0300
 Subject: [PATCH] build: Fix mkspecs and CMake module install directories
+
 Organization: O.S. Systems Software LTDA.

 Upstream-Status: Inapropriate [configuration]

 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
 ---
- CMakeLists.txt     | 2 +-
- pkg/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d78fedf..1f4db6b 100644
+index 0695a76..f2266c9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -27,7 +27,7 @@ endfunction(QUERY_QMAKE)
+@@ -34,7 +34,7 @@ endfunction(QUERY_QMAKE)
 query_qmake(QT_INSTALL_PLUGINS QT_PLUGINS_DIR)
 query_qmake(QT_HOST_DATA QT_DATA_DIR)
 
 -set(QT_MKSPECS_DIR ${QT_DATA_DIR}/mkspecs)
 +set(QT_MKSPECS_DIR ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs)
 
- # Configure options
- option(GENERATE_DOC
-diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt
-index 25891a5..a87fedd 100644
--- a/pkg/CMakeLists.txt
-+++ b/pkg/CMakeLists.txt
-@@ -19,6 +19,6 @@ if(PKG_CONFIG_FOUND)
-     )
- endif(PKG_CONFIG_FOUND)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/FindTufao${TUFAO_VERSION_MAJOR}.cmake"
-    DESTINATION "${CMAKE_ROOT}/Modules"
-+    DESTINATION "${libdir}/cmake"
-     COMPONENT development
- )
+ # Debug version of library should have 'd' postfix on Windows
+ # and '_debug' on Mac OS X
 -- 
 2.0.0.rc4

--- a/recipes-qt/tufao/tufao_1.3.10.bb
+++ b/recipes-qt/tufao/tufao_1.3.10.bb
@@ -3,8 +3,8 @@ LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
 DEPENDS = "qtbase"

-SRCREV = "a4832b4c941b5ff3f5fab23adcff39e6ad6cb4e5"
-SRC_URI = "git://github.com/vinipsmaker/tufao.git;protocol=http \
+SRCREV = "ad505c32d0ba14c3c616de8ba4c7eb79396c20a6"
+SRC_URI = "git://github.com/vinipsmaker/tufao.git;protocol=http;branch=1.x \
           file://build-Fix-mkspecs-and-CMake-module-install-directori.patch"

 # This includes bugfixes from 1.x branch