summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-09-25 10:29:24 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-09-29 06:38:12 +0000
commit48da0529c59c245c53f982ebcc674750669b5979 (patch)
tree026934e35d43df98399afe8d0083433d3b260f26
parent6269d8a5bc402e6dafd8ee8499481d29792d1c4a (diff)
downloadmeta-qt5-48da0529c59c245c53f982ebcc674750669b5979.tar.gz
qt5: update submodules
Update submodules to first 5.9.2 branch snapshot Change-Id: If1a6cff5a23bfa1e72b65b5d1f679a3ff64f7c6c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat
-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/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_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/qtlocation/0001-Make-mapbox-gl-build-configurable.patch27
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb9
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_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/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_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/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch25
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb5
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
33 files changed, 33 insertions, 91 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 57e6093d..98690370 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -197,4 +197,4 @@ fakeroot do_generate_qt_environment_file() {
197 197
198addtask generate_qt_environment_file after do_install before do_package 198addtask generate_qt_environment_file after do_install before do_package
199 199
200SRCREV = "0f11fab6f75dec78d3721280971448cc2edd6e72" 200SRCREV = "807fa90b32466fd936704459884c12214d8a254f"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 7ffc6a49..48820c16 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -37,6 +37,6 @@ do_configure_prepend() {
37 ${S}/src/quick3d/imports/input/importsinput.pro 37 ${S}/src/quick3d/imports/input/importsinput.pro
38} 38}
39 39
40SRCREV = "595b4add0ce6f32bb8ffc56b3a59e6e5bf0b000a" 40SRCREV = "72e80520d36802672eca1e93bc6c6019e6f5ffc3"
41 41
42BBCLASSEXTEND += "native nativesdk" 42BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 4ff86522..04e63068 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -114,4 +114,4 @@ do_install() {
114 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} 114 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
115} 115}
116 116
117SRCREV = "0f11fab6f75dec78d3721280971448cc2edd6e72" 117SRCREV = "807fa90b32466fd936704459884c12214d8a254f"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 89e1b4ca..d8aeca89 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -222,4 +222,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
222 222
223RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 223RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
224 224
225SRCREV = "0f11fab6f75dec78d3721280971448cc2edd6e72" 225SRCREV = "807fa90b32466fd936704459884c12214d8a254f"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index f46cbc2c..17479e2f 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "25447e889dc43c0831100bee1625a6f667d364cf" 13SRCREV = "a1aee8ecbefb74cd5eae380ced56bb43ff3cc40b"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index d90b9f62..da6e999f 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "5261307d061a2b925faffb6ea21aa3dbca1e50a9" 11SRCREV = "e3af14e9169207e0e73f7e50191106895c29ddc4"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 9e91a1d4..030a40f3 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,${BLUEZ}"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4" 22SRCREV = "ae21b2574c0000aac6e3b10f7e11ebd1da567ffd"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 3737e107..7c8eda76 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 = "3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f" 11SRCREV = "8329a8fb287094012989b965604ff9c9426f022a"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index c409ae6c..c00895be 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -33,6 +33,6 @@ do_install_append_class-nativesdk() {
33 33
34EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 34EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
35 35
36SRCREV = "2c45bdb0e2433b2246d985b61348f8caa6e5926b" 36SRCREV = "960bebd61f70c39e2fbce9f67b889cd64f48cea7"
37 37
38BBCLASSEXTEND =+ "native nativesdk" 38BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index a771d9da..7e6cb1b2 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 = "1fc40deed6993265c436783cc367285bf9a2266a" 17SRCREV = "167566d228792c0f763b84a39ff5dc52fda046dd"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 6c6f3aef..f2b7d2e9 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 = "b6ff12df5496f3d296bb438ae343d5f771e93fec" 21SRCREV = "8c4488a77d5fe4fed26b22dbc91b746a77cd0562"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 1e022f4a..a0d6a0dd 100644
--- 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"
26 26
27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
28 28
29SRCREV = "144a3535db9f95e60972d3c3b6eaceb65a604577" 29SRCREV = "0d42a2e44491980e6803d6aee6c7d2e83acadec4"
diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
deleted file mode 100644
index 5ed06f3b..00000000
--- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From a7e5dcb12a7fad02206b89ba20a99726df7d6f4b Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 7 Jun 2017 13:29:29 +0300
4Subject: [PATCH] Make mapbox-gl build configurable
5
6mapbox-gl-native won't compile for ARMv5 or older, so disable the
7build by default.
8
9Task-number: QTBUG-61289
10Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b
11---
12 src/plugins/geoservices/geoservices.pro | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
16index 07c3479..55d0040 100644
17--- a/src/plugins/geoservices/geoservices.pro
18+++ b/src/plugins/geoservices/geoservices.pro
19@@ -6,7 +6,7 @@ qtConfig(concurrent) {
20 SUBDIRS += osm
21 }
22
23-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
24+mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
25 !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) {
26 warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
27 } else {
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 268bea1d..cce66017 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -13,17 +13,12 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
15 15
16SRC_URI += " \
17 file://0001-Make-mapbox-gl-build-configurable.patch \
18"
19
20PACKAGECONFIG ??= "" 16PACKAGECONFIG ??= ""
21# older geoclue 0.12.99 is needed 17# older geoclue 0.12.99 is needed
22PACKAGECONFIG[geoclue] = ",,geoclue" 18PACKAGECONFIG[geoclue] = ",,geoclue"
23PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" 19PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy"
24PACKAGECONFIG[mapboxgl] = "" 20PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl"
25 21
26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'mapboxgl', 'CONFIG+=mapboxgl', '', d)}"
27EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 22EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
28 23
29# The same issue as in qtbase: 24# The same issue as in qtbase:
@@ -34,7 +29,7 @@ SRC_URI += " \
34 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 29 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
35" 30"
36 31
37SRCREV_qtlocation = "d22e6d09f1607e694694d2ae5b2f447605a8782e" 32SRCREV_qtlocation = "d919f47308b209c798e50d8ca1b9abd48ba94718"
38SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" 33SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead"
39 34
40SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 35SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 729b3ffd..f42bdc27 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,4 +35,4 @@ SRC_URI += "\
35# http://errors.yoctoproject.org/Errors/Build/44914/ 35# http://errors.yoctoproject.org/Errors/Build/44914/
36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
37 37
38SRCREV = "343e281f0e7cc7fd9e1558e4d92f5019fa565181" 38SRCREV = "1e2702e86dbd2b3de69c58438bcfcf6276124547"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 0655b425..e5ca4dfd 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 = "3d93f6436596e349e43c3798b675af66db71df8a" 12SRCREV = "47b80ecae6fe0b9a2c74f0b0feb243145695995e"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 4b2924b0..64cfbdf7 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" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "63f2f55462f2f040cfe175ada8aa1e01168597fc" 13SRCREV = "871d8e8e2faca0be870930d83f755a2ad484d30b"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index fd6d5954..aa9a9f09 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -31,4 +31,4 @@ SRC_URI += " \
31 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 31 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
32" 32"
33 33
34SRCREV = "633c5642611234cf204569471598c3d3c083b84c" 34SRCREV = "8476f8fff7dc5b6f140074d280828cc0f9590088"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 9061c3c7..50d2190f 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -29,4 +29,4 @@ DEPENDS += "qtbase"
29# http://errors.yoctoproject.org/Errors/Build/44915/ 29# http://errors.yoctoproject.org/Errors/Build/44915/
30LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 30LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
31 31
32SRCREV = "86ee61734e0331459f9cfeb1ad56f773b7e994be" 32SRCREV = "08b74f4f30c304b80249a593a572808bc1892f66"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 36ca665d..3e8599a2 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 = "a1dff1a11ad303a1f82f181e6386194de90ec08f" 13SRCREV = "16956a965817311fbc9d80ffbee74eb5d9ea00e0"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
16# 5.9.meta-qt5.2 16# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 6b2c28e3..014b68f7 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 = "1673dbed00ba68209b6de95981f1e3b4a2a24682" 15SRCREV = "c273f2e5c82a3ef8e55e360988b8cf31362e2ba9"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 0b30043c..8df89137 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 = "1d37c357c843a2622d2af7e1684576e19a8c7c30" 14SRCREV = "ce5a3ced5eeefe05675736d3279d4d45bbb6df90"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 23f03cea..9530eea0 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "93b539140c06da07d330c9ecad67ab5ed3f9b0c8" 18SRCREV = "f9f02db5fc6ca4da97be63a67c469af49f97ab3b"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 4becdbb6..2a4f256d 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -30,7 +30,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
30 30
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
32 32
33SRCREV = "28b1b88a0b85f4ce7765ed5cc5f3780f97e5ea4f" 33SRCREV = "ad18484063a41328d0e72c75cda151128977e0d8"
34 34
35BBCLASSEXTEND = "native nativesdk" 35BBCLASSEXTEND = "native nativesdk"
36 36
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 122d0681..5b544555 100644
--- 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"
53 53
54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
55 55
56SRCREV = "dd8c39ea9312ec1441b3fdd830f9d42fe3258b58" 56SRCREV = "87218c4e68c4ebde8f5765f0dfe9a70a359ae05f"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 04de8292..979969ba 100644
--- 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
37 37
38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "a97b4f8504cd4bccebed60934e5b842610454b39" 40SRCREV = "d483ed2927cb8d4685d5d3c7ea1c71246381910b"
41 41
42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
43# 5.9.meta-qt5.2 43# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 7e12a337..1e0796ab 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 = "b5229df6a08a902b11a2fc9529af6385f4d985d5" 15SRCREV = "61a638663c9061d7211849d3a9316661733a5ad9"
diff --git 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
deleted file mode 100644
index d8d89b8e..00000000
--- a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 331de4be615b8552e498ac2f3deff4b49b4b0fc0 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 20 Aug 2017 20:37:38 +0200
4Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree
5
6* as cfree man says:
7 This function should never be used. Use free(3) instead.
8 Starting with version 2.26, it has been removed from glibc.
9---
10 src/core/api/qtbug-61521.cpp | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp
14index 86d5998e..1dcc4cfa 100644
15--- a/src/core/api/qtbug-61521.cpp
16+++ b/src/core/api/qtbug-61521.cpp
17@@ -100,7 +100,7 @@ SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) {
18 }
19
20 SHIM_HIDDEN void ShimCFree(void* ptr) {
21- cfree(ptr);
22+ free(ptr);
23 }
24
25 SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) {
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 6e5a34cc..6f32aaee 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -136,7 +136,6 @@ SRC_URI += " \
136 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ 136 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
137 file://0003-Include-dependency-to-QCoreApplication-translate.patch \ 137 file://0003-Include-dependency-to-QCoreApplication-translate.patch \
138 file://0004-Force-host-toolchain-configuration.patch \ 138 file://0004-Force-host-toolchain-configuration.patch \
139 file://0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch \
140" 139"
141 140
142# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 141# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based
@@ -163,8 +162,8 @@ SRC_URI_append_libc-musl = "\
163 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 162 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
164" 163"
165 164
166SRCREV_qtwebengine = "0f6908b5f9eca09cf086410344a862b9d59ef727" 165SRCREV_qtwebengine = "fb639faa8898ce6b8fbcc8870ec316114a79f975"
167SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9" 166SRCREV_chromium = "02fb09feaed516d49c50f51172d687adf382e49e"
168SRCREV = "${SRCREV_qtwebengine}" 167SRCREV = "${SRCREV_qtwebengine}"
169 168
170SRCREV_FORMAT = "qtwebengine_chromium" 169SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 3bb690b4..cb68b46c 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 = "fb71c823a7ae823345518ca33ccfe273fcf76494" 14SRCREV = "0f32f4efc5a9a8b33369013c2ba6c27c78498cf2"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 0bbb09ea..2823c8b1 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d" 22SRCREV = "01ff5c0d5f937577cfd2391a43af4180f2a484bb"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index ed1440c1..1988fe38 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8" 16SRCREV = "90d5d612bc7b3450a7a9d5c37c2de1d150f95182"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 7c18079a..d4fccafe 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \
17 17
18DEPENDS += "qtbase" 18DEPENDS += "qtbase"
19 19
20SRCREV = "fcfa824402bb4edaf644fad786dac3560c743ebe" 20SRCREV = "8d7e1e0ec06724a4d332c050e9260530c708e773"
21 21
22BBCLASSEXTEND =+ "native nativesdk" 22BBCLASSEXTEND =+ "native nativesdk"
23 23
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 10:57:31 +0000