summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-02-29 21:52:28 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-03-06 09:15:45 +0200
commitc29bdf41c4494e278a17a233048205bf212e040f (patch)
tree964f9c8278d02ce49cbd6cff4a47189f4eba47fb
parent2380ffc4b549bf233927df66f9d981f4c417628c (diff)
downloadmeta-qt5-c29bdf41c4494e278a17a233048205bf212e040f.tar.gz
qt5: update submodules
Update to latest content in Qt 5.15 branch. Task-number: QTBUG-80823 Change-Id: I5230d9fea7ee8d0cb3227e77d62c93ae0cd921b3 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtcoap_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtknx_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmqtt_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtpurchasing_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch12
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch8
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb6
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
37 files changed, 51 insertions, 51 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 3959a42d..c0f2c565 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() {
195do_generate_qt_environment_file[umask] = "022" 195do_generate_qt_environment_file[umask] = "022"
196addtask generate_qt_environment_file after do_install before do_package 196addtask generate_qt_environment_file after do_install before do_package
197 197
198SRCREV = "291b3cebb905c3924eefa1e5a7c6ac31ca89aacd" 198SRCREV = "c58249c32774646a4be5c7504339b483d658a4da"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 9e2a36b4..e63b8757 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
36 ${S}/src/quick3d/imports/input/importsinput.pro 36 ${S}/src/quick3d/imports/input/importsinput.pro
37} 37}
38 38
39SRCREV = "aa7c8a5cb1111d46289e6b370dcd5b1d3f66c80d" 39SRCREV = "76b39dd90f613f340066cc5a4ceed65ff778bdd4"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 78e10b15..489b9950 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -142,4 +142,4 @@ do_install() {
142 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 142 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
143} 143}
144 144
145SRCREV = "291b3cebb905c3924eefa1e5a7c6ac31ca89aacd" 145SRCREV = "c58249c32774646a4be5c7504339b483d658a4da"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 5eb7ab1a..90a048cb 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -292,4 +292,4 @@ sed -i \
292 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 292 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
293} 293}
294 294
295SRCREV = "291b3cebb905c3924eefa1e5a7c6ac31ca89aacd" 295SRCREV = "c58249c32774646a4be5c7504339b483d658a4da"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 3d051750..8d3386de 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "41bdefce20be3ebbeebaba215402211664a29c79" 11SRCREV = "c8e3bf290551328851cf628ce4a488a06b013ac2"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb
index 83ca70e6..875d8da9 100644
--- a/recipes-qt/qt5/qtcoap_git.bb
+++ b/recipes-qt/qt5/qtcoap_git.bb
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
11 11
12DEPENDS += "qtbase" 12DEPENDS += "qtbase"
13 13
14SRCREV = "82379a1de608f696c28429a8f7a901b9996d6eff" 14SRCREV = "8d3da74a5828b4c09847342bc45855d0889ede7d"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 6c422028..5466217e 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "79702f744e4906155736967dea1af5433355c71a" 22SRCREV = "531443d1f00c0ebc6a56ebc30e5eea85b318b73e"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 0103f4e9..b96096ca 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "9ba8b807d002e0b93afe5e08221cf6c38b0055fb" 11SRCREV = "407bee91eb83b6ff2df6e5d99366971bf21e2637"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index c857e563..47122d86 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -28,6 +28,6 @@ do_install_append_class-nativesdk() {
28 rm -rf ${D}${OE_QMAKE_PATH_QML} 28 rm -rf ${D}${OE_QMAKE_PATH_QML}
29} 29}
30 30
31SRCREV = "b3ff342d327dc00d99281dca4fbfe6c4300aa6c6" 31SRCREV = "1fef24732bb5114392626a7fef956625a6cc66ac"
32 32
33BBCLASSEXTEND =+ "native nativesdk" 33BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 0944c14f..36998ffa 100644
--- 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"
14 14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16 16
17SRCREV = "3c91ce46a69449a0350b63a17c79cd69090ffcc0" 17SRCREV = "196713714a63e789b65822e2222208251857359b"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 50d1d4b8..130fa183 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "20f436e045bc4636af6acecfa11478f926d4be42" 21SRCREV = "617bb58eb0b381ae6095fe8947bc7f9e25ef85b1"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 3b5f1908..3efc5a84 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "d89c6be6f28182111cabe9547d10e31d8a7cd05f" 28SRCREV = "5a1a12b0e135eb49f7b232c729859583b76bd507"
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb
index 951edde2..c2db7b75 100644
--- a/recipes-qt/qt5/qtknx_git.bb
+++ b/recipes-qt/qt5/qtknx_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "e4b624f9af5eab253c75a8800e497662b57648c7" 12SRCREV = "5cf641e7c61d12b0542252cd423aec64ae891f0c"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 367a2c6c..3924f8cd 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -35,7 +35,7 @@ SRC_URI += " \
35 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 35 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
36" 36"
37 37
38SRCREV_qtlocation = "47391b2d74f65ea3a3a67c0a5359499582d6cfdb" 38SRCREV_qtlocation = "0a074c7164f562417b2667c175d4e20d63415b48"
39SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb" 39SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb"
40 40
41SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 41SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index 22858e06..a550e720 100644
--- a/recipes-qt/qt5/qtmqtt_git.bb
+++ b/recipes-qt/qt5/qtmqtt_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "d8ef5280d7d0773ac0b415994e6978e96fe228cc" 12SRCREV = "2bba786b2543811c28f379fa12f3c7110ff0664f"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 0ff3ff5e..7cdf59a1 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -37,4 +37,4 @@ SRC_URI += "\
37# http://errors.yoctoproject.org/Errors/Build/44914/ 37# http://errors.yoctoproject.org/Errors/Build/44914/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 39
40SRCREV = "70f5eb4f707ce84cbf153899d33d6bd8656be682" 40SRCREV = "19477de84a64f412bca9ce2df62ab9adb3859da2"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 745fc082..05d322cc 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "3e3f047e59db88e806b3c1fd94c4a996f5317b68" 12SRCREV = "1afc99397bd35fc3cd24913f5dc10743de1833dc"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index 252753a0..a22d61f6 100644
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtbase qtdeclarative" 11DEPENDS += "qtbase qtdeclarative"
12 12
13SRCREV = "3ef91292426c4aa56989e843e1c675a7ba6ac1c9" 13SRCREV = "0fd1c5413bd433755e54c7d69493efc45c432764"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index cf8c6ad4..2686de7a 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -22,7 +22,7 @@ FILES_${PN}-qmlplugins += " \
22 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ 22 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
23" 23"
24 24
25SRCREV_qtquick3d = "0cb944343f032bc6fca94fd4375dce422217d329" 25SRCREV_qtquick3d = "a24fc6de882bd1a5265dabd26855997d6879d906"
26SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" 26SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
27 27
28SRCREV_FORMAT = "qtquick3d_assimp" 28SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 40e3d765..3c81446e 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative qtdeclarative-native" 11DEPENDS += "qtdeclarative qtdeclarative-native"
12 12
13SRCREV = "35afc8d21b2f705463ec56d3e11679efb798b757" 13SRCREV = "814682bb9a5c9ccaff30662dd757cd827f39aad0"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 5a44f19d..6d26cea7 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
18" 18"
19 19
20SRCREV = "7a806347167607172ee38c60d30808b298224a8b" 20SRCREV = "d286adc5c7c27fdbbb7887f3a77212a49726cede"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index b87fa237..c989541d 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -36,4 +36,4 @@ DEPENDS += "qtbase"
36# http://errors.yoctoproject.org/Errors/Build/44915/ 36# http://errors.yoctoproject.org/Errors/Build/44915/
37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
38 38
39SRCREV = "3a358430efe797fe1c0f1aa7f701f9139a642d6f" 39SRCREV = "36300dd06bb8191800ec93ca5a408f39b1f221eb"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 2bc92b9e..bad7ece7 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "bae669b37d3828eb73e78e7c77f0a5fccf8e3150" 13SRCREV = "61ed1a9e09fe54b0d52afbf865de03c8c4eaed82"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.13 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.13
16# 5.13.meta-qt5.1 16# 5.13.meta-qt5.1
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 34703bde..9c352599 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "63c972ad9e15b673779147c4c263ed2ac5312a28" 15SRCREV = "53ce60e9f9bf8a6c6b6f1c293564998b431987be"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 223b9e00..affc5381 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "a3aa54e27094b80feae4e42c5f7e22c3d4022b49" 14SRCREV = "8b1a6de795523156a5a74dd2a544d866a8beeb53"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 63fbf2c7..425f7fdd 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "f48bf0293a682aef90e6e5b16cf5a9a06b7a32d2" 15SRCREV = "215a6642a48b1272a54ce2d125346fa0b8c89847"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 6d426915..49a1790f 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -49,7 +49,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
49 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ 49 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
50" 50"
51 51
52SRCREV = "d8a971b8475035f61e1ad3baaef6a8c49556c42d" 52SRCREV = "94ee5927f5551d32876f5854c8b0f630b68b4659"
53 53
54BBCLASSEXTEND = "native nativesdk" 54BBCLASSEXTEND = "native nativesdk"
55 55
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 3b5a08f7..42c3eeb5 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ 98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
99" 99"
100 100
101SRCREV = "9d7437583d7475aa069ec5aa786fa9c5aa36253b" 101SRCREV = "fc73b5dbf6d7719dca652a1cf3aa71ba5d58f8ce"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 6d26e9f6..25f1cce8 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
71 71
72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" 72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
73 73
74SRCREV = "39a3c50f6f3d3aff52853510543388638a2524d5" 74SRCREV = "95be4f1e3945f88adc9d55fa06371665254a1127"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 1f82c9a5..e583d328 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -39,7 +39,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
39 39
40EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 40EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
41 41
42SRCREV = "cfc4043626e05649e51607a92ceb87d31e0d1b06" 42SRCREV = "7458370a6facf4261df90eea7230382756608a2e"
43 43
44BBCLASSEXTEND =+ "native nativesdk" 44BBCLASSEXTEND =+ "native nativesdk"
45 45
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index cdb40635..f71c3b9b 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
14 14
15SRCREV = "facf59c1eae3958b8c2972c167cede215219c814" 15SRCREV = "1f793c887773f9b7477a73467aa1e2497ffef25c"
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/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index 2fdb0d82..bd16cee2 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
1From 4b16ad982ff10945a37a7dd90735a5a1be3d6a8b Mon Sep 17 00:00:00 2001 1From 37648db3a564bc4bdcecfc2a38bc21d45875088e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:09:06 -0700 3Date: Fri, 7 Jul 2017 14:09:06 -0700
4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux 4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
@@ -10,17 +10,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 2 files changed, 4 insertions(+), 2 deletions(-) 10 2 files changed, 4 insertions(+), 2 deletions(-)
11 11
12diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc 12diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
13index 5763432aa4f..ff00b7307c0 100644 13index 044bd8d244f..cec43e1d59b 100644
14--- a/chromium/base/process/process_metrics_posix.cc 14--- a/chromium/base/process/process_metrics_posix.cc
15+++ b/chromium/base/process/process_metrics_posix.cc 15+++ b/chromium/base/process/process_metrics_posix.cc
16@@ -109,14 +109,14 @@ size_t ProcessMetrics::GetMallocUsage() { 16@@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() {
17 malloc_statistics_t stats = {0}; 17 malloc_statistics_t stats = {0};
18 malloc_zone_statistics(nullptr, &stats); 18 malloc_zone_statistics(nullptr, &stats);
19 return stats.size_in_use; 19 return stats.size_in_use;
20-#elif defined(OS_LINUX) || defined(OS_ANDROID) 20-#elif defined(OS_LINUX) || defined(OS_ANDROID)
21+#elif defined(__GLIBC__) || defined(OS_ANDROID) 21+#elif defined(__GLIBC__) || defined(OS_ANDROID)
22 struct mallinfo minfo = mallinfo(); 22 struct mallinfo minfo = mallinfo();
23 #if defined(USE_TCMALLOC) 23 #if BUILDFLAG(USE_TCMALLOC)
24 return minfo.uordblks; 24 return minfo.uordblks;
25 #else 25 #else
26 return minfo.hblkhd + minfo.arena; 26 return minfo.hblkhd + minfo.arena;
@@ -31,7 +31,7 @@ index 5763432aa4f..ff00b7307c0 100644
31 return 0; 31 return 0;
32 #endif 32 #endif
33diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc 33diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
34index 0077d8b0aec..c69f893f4e9 100644 34index 7e42cfc20bb..4e24fc711ad 100644
35--- a/chromium/base/trace_event/malloc_dump_provider.cc 35--- a/chromium/base/trace_event/malloc_dump_provider.cc
36+++ b/chromium/base/trace_event/malloc_dump_provider.cc 36+++ b/chromium/base/trace_event/malloc_dump_provider.cc
37@@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; 37@@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default;
@@ -42,7 +42,7 @@ index 0077d8b0aec..c69f893f4e9 100644
42 { 42 {
43 base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_); 43 base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_);
44 if (!emit_metrics_on_memory_dump_) 44 if (!emit_metrics_on_memory_dump_)
45@@ -172,6 +173,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, 45@@ -175,6 +176,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
46 MemoryAllocatorDump::kUnitsBytes, 46 MemoryAllocatorDump::kUnitsBytes,
47 resident_size - allocated_objects_size); 47 resident_size - allocated_objects_size);
48 } 48 }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
index 2fdc4944..c5667e9d 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
1From 04a11fa6f38987091b6b65244950d3d83579c9a8 Mon Sep 17 00:00:00 2001 1From b6ef8cafefad7082fd681ff8386835d7bebdb38c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:54:38 -0700 3Date: Fri, 7 Jul 2017 14:54:38 -0700
4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction 4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
@@ -9,15 +9,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
9 1 file changed, 1 insertion(+), 1 deletion(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc 11diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc
12index 5fb86467dde..9864858eb67 100644 12index 5ea77ef2d27..85343a13905 100644
13--- a/chromium/base/allocator/allocator_check.cc 13--- a/chromium/base/allocator/allocator_check.cc
14+++ b/chromium/base/allocator/allocator_check.cc 14+++ b/chromium/base/allocator/allocator_check.cc
15@@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { 15@@ -27,7 +27,7 @@ bool IsAllocatorInitialized() {
16 // Set by allocator_shim_override_ucrt_symbols_win.h when the 16 // Set by allocator_shim_override_ucrt_symbols_win.h when the
17 // shimmed _set_new_mode() is called. 17 // shimmed _set_new_mode() is called.
18 return g_is_win_shim_layer_initialized; 18 return g_is_win_shim_layer_initialized;
19-#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ 19-#elif defined(OS_LINUX) && BUILDFLAG(USE_TCMALLOC) && \
20+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ 20+#elif defined(__GLIBC__) && BUILDFLAG(USE_TCMALLOC) && \
21 !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) 21 !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
22 // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. 22 // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.
23 // TODO(primiano): replace with an include once base can depend on allocator. 23 // TODO(primiano): replace with an include once base can depend on allocator.
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/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
index 81d555f9..facc53d9 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -1,4 +1,4 @@
1From 59ab7f11b90bd2114ff8cc16d6502e0ad6bb6538 Mon Sep 17 00:00:00 2001 1From 2502151f355d0cc9d1c3681958df73c35010c145 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:09:02 -0700 3Date: Fri, 7 Jul 2017 15:09:02 -0700
4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols 4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
@@ -10,15 +10,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc 12diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
13index e6838ebda84..7296cc9ed81 100644 13index ef42d5ad67f..626e4c996a5 100644
14--- a/chromium/base/allocator/allocator_shim.cc 14--- a/chromium/base/allocator/allocator_shim.cc
15+++ b/chromium/base/allocator/allocator_shim.cc 15+++ b/chromium/base/allocator/allocator_shim.cc
16@@ -351,7 +351,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) { 16@@ -352,7 +352,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) {
17 // In the case of tcmalloc we also want to plumb into the glibc hooks 17 // In the case of tcmalloc we also want to plumb into the glibc hooks
18 // to avoid that allocations made in glibc itself (e.g., strdup()) get 18 // to avoid that allocations made in glibc itself (e.g., strdup()) get
19 // accidentally performed on the glibc heap instead of the tcmalloc one. 19 // accidentally performed on the glibc heap instead of the tcmalloc one.
20-#if defined(USE_TCMALLOC) 20-#if BUILDFLAG(USE_TCMALLOC)
21+#if defined(USE_TCMALLOC) && defined(__GLIBC__) 21+#if BUILDFLAG(USE_TCMALLOC) && defined(__GLIBC__)
22 #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" 22 #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h"
23 #endif 23 #endif
24 24
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 3b2362a1..cd083a00 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -135,7 +135,7 @@ RDEPENDS_${PN}-examples += " \
135 qtdeclarative-qmlplugins \ 135 qtdeclarative-qmlplugins \
136" 136"
137 137
138QT_MODULE_BRANCH_CHROMIUM = "77-based" 138QT_MODULE_BRANCH_CHROMIUM = "79-based"
139 139
140# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.14 140# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.14
141# 5.14.meta-qt5.1 141# 5.14.meta-qt5.1
@@ -180,8 +180,8 @@ SRC_URI_append_libc-musl = "\
180 file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 180 file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
181" 181"
182 182
183SRCREV_qtwebengine = "d9349a299f66fb154ad24f410451872a7ca253fb" 183SRCREV_qtwebengine = "795d5e2666cababe4fbf8533d8a49fdc40d8d4c1"
184SRCREV_chromium = "5b79320c01316f29510df90f7c6b508b9f72b8a4" 184SRCREV_chromium = "07787da493d9a71b994582904a188a53aae9e473"
185SRCREV = "${SRCREV_qtwebengine}" 185SRCREV = "${SRCREV_qtwebengine}"
186 186
187SRCREV_FORMAT = "qtwebengine_chromium" 187SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index be4a6029..dfeec8b0 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "127d475324c2133b8d7e2f4712e71d14fa84c560" 14SRCREV = "5bc1a1f85fedd7d65298f0a4c8ea79fb0670c0d7"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index e63312b3..a8b7005c 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -25,7 +25,7 @@ do_configure_prepend() {
25 25
26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
27 27
28SRCREV = "2dfdd4f0bdd6647c104470712f0e463021488e43" 28SRCREV = "837fe1627fce599bfb9a906d33d14df34648ba89"
29 29
30BBCLASSEXTEND =+ "native nativesdk" 30BBCLASSEXTEND =+ "native nativesdk"
31 31