summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-01-30 12:10:07 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-02-04 23:10:03 +0200
commit27c10f248765d736bc45fd7d9ff6afd609a804fc (patch)
tree9f1d2d9e98f240d8857d64fd30975853177f8cbe
parentc017b5dc4c3d3e59f64c3beb7316335f6d341ee4 (diff)
downloadmeta-qt5-27c10f248765d736bc45fd7d9ff6afd609a804fc.tar.gz
qt5: update submodules
* Update to latest content in Qt 5.15 branch * Exclude qtwebkit recipe from CI & toolchain as it does not build with latest 5.15 content * Remove qtwebkit dependency in qtcreator recipe, it is not needed anymore Task-number: QTBUG-80823 Change-Id: I4e98c56749f5f5cd24efbd1e021b39e3947954a5 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--coin/module_config.yaml3
-rwxr-xr-xrecipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb2
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch11
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-creator_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/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.bb4
-rw-r--r--recipes-qt/qt5/qtimageformats_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/qtremoteobjects_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/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_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
34 files changed, 43 insertions, 39 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index e467be40..6ce600eb 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -92,6 +92,8 @@ build_instructions:
92 RDEPENDS_${PN}-dbg_pn-x11-common = "" 92 RDEPENDS_${PN}-dbg_pn-x11-common = ""
93 # to fix apm, fso-apm conflict in shr-image-all 93 # to fix apm, fso-apm conflict in shr-image-all
94 VIRTUAL-RUNTIME_apm = "fso-apm" 94 VIRTUAL-RUNTIME_apm = "fso-apm"
95 # remove qtwebkit-dev
96 USE_RUBY = ""
95 # require conf/distro/include/qt5-versions.inc 97 # require conf/distro/include/qt5-versions.inc
96 # QT5_VERSION = "5.4.0+git%" 98 # QT5_VERSION = "5.4.0+git%"
97 # for qtwebkit etc 99 # for qtwebkit etc
@@ -156,6 +158,7 @@ build_instructions:
156 # EXCLUDE_FROM_WORLD 158 # EXCLUDE_FROM_WORLD
157 rm -f ${SOURCE_DIR}/recipes-qt/examples/qt5-opengles2-test_git.bb 159 rm -f ${SOURCE_DIR}/recipes-qt/examples/qt5-opengles2-test_git.bb
158 rm -r ${SOURCE_DIR}/recipes-python/pyqt5/python-pyqt5_5.13.2.bb 160 rm -r ${SOURCE_DIR}/recipes-python/pyqt5/python-pyqt5_5.13.2.bb
161 rm -r ${SOURCE_DIR}/recipes-qt/qt5/qtwebkit_git.bb
159 162
160 bitbake $(find ${SOURCE_DIR} -name *.bb | xargs -n1 basename | sed -e 's/\([^._]*\).*/\1/') 163 bitbake $(find ${SOURCE_DIR} -name *.bb | xargs -n1 basename | sed -e 's/\([^._]*\).*/\1/')
161 filename: "{{.BuildDir}}/start-build" 164 filename: "{{.BuildDir}}/start-build"
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 0fca38e6..ef5cb01e 100755
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -9,7 +9,7 @@ inherit packagegroup
9PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" 9PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
10 10
11# Requires Ruby to work 11# Requires Ruby to work
12USE_RUBY = " \ 12USE_RUBY ?= " \
13 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-dev', '', d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-dev', '', d)} \
14" 14"
15 15
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 51d9fd59..9e598379 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -196,4 +196,4 @@ fakeroot do_generate_qt_environment_file() {
196do_generate_qt_environment_file[umask] = "022" 196do_generate_qt_environment_file[umask] = "022"
197addtask generate_qt_environment_file after do_install before do_package 197addtask generate_qt_environment_file after do_install before do_package
198 198
199SRCREV = "663d00c71697a3383d9b3f3bb42b72c3d8eeaa05" 199SRCREV = "be8c257da9a264994243c120231965ff0008ef09"
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 d28b150f..7e601abf 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 @@
1From e77e54151e4ebee6996c13675ca0a68c880f9960 Mon Sep 17 00:00:00 2001 1From 34fabf8231972d33558ac054fa1b23661d5266a6 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 17 Aug 2018 13:23:58 +0300 3Date: Fri, 17 Aug 2018 13:23:58 +0300
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
@@ -10,7 +10,7 @@ Subject: [PATCH] Allow a tools-only build
10 3 files changed, 9 insertions(+), 4 deletions(-) 10 3 files changed, 9 insertions(+), 4 deletions(-)
11 11
12diff --git a/qt3d.pro b/qt3d.pro 12diff --git a/qt3d.pro b/qt3d.pro
13index d5dbda4b9..6809470b6 100644 13index c5232e116..88e5559c8 100644
14--- a/qt3d.pro 14--- a/qt3d.pro
15+++ b/qt3d.pro 15+++ b/qt3d.pro
16@@ -1,4 +1,4 @@ 16@@ -1,4 +1,4 @@
@@ -19,15 +19,16 @@ index d5dbda4b9..6809470b6 100644
19 requires(qtConfig(opengl):!wasm) 19 requires(qtConfig(opengl):!wasm)
20 20
21 CONFIG += examples_need_tools 21 CONFIG += examples_need_tools
22@@ -15,3 +15,8 @@ load(qt_parts) 22@@ -16,3 +16,8 @@ load(qt_parts)
23
24 OTHER_FILES += \ 23 OTHER_FILES += \
25 sync.profile 24 sync.profile \
25 .qmake.conf
26+ 26+
27+tools-only { 27+tools-only {
28+ sub_tools.depends -= sub_src 28+ sub_tools.depends -= sub_src
29+ SUBDIRS = sub_tools 29+ SUBDIRS = sub_tools
30+} 30+}
31\ No newline at end of file
31diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri 32diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
32index 8ba2d9a41..e973d93dd 100644 33index 8ba2d9a41..e973d93dd 100644
33--- a/src/3rdparty/assimp/assimp_dependency.pri 34--- a/src/3rdparty/assimp/assimp_dependency.pri
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 2b444ad2..b9a0d30e 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 = "7d0bcdb027826997b76f84f25e9eb06ea365205c" 39SRCREV = "4cd35e87b63d2ff4bc4ee88b6080f812de45d239"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb
index 5b723ab4..5c11e4e8 100644
--- a/recipes-qt/qt5/qt5-creator_git.bb
+++ b/recipes-qt/qt5/qt5-creator_git.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
14 14
15inherit qmake5 15inherit qmake5
16 16
17DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib" 17DEPENDS = "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib"
18DEPENDS_append_toolchain-clang = " clang llvm-common" 18DEPENDS_append_toolchain-clang = " clang llvm-common"
19DEPENDS_append_libc-musl = " libexecinfo" 19DEPENDS_append_libc-musl = " libexecinfo"
20 20
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 8145ffc5..138fc088 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -143,4 +143,4 @@ do_install() {
143 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 143 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
144} 144}
145 145
146SRCREV = "663d00c71697a3383d9b3f3bb42b72c3d8eeaa05" 146SRCREV = "be8c257da9a264994243c120231965ff0008ef09"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index c0e87568..6fc91ede 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -293,4 +293,4 @@ sed -i \
293 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 293 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
294} 294}
295 295
296SRCREV = "663d00c71697a3383d9b3f3bb42b72c3d8eeaa05" 296SRCREV = "be8c257da9a264994243c120231965ff0008ef09"
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb
index 579a7308..365bf2ef 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 = "f20d16c3809cf5641d597c2a8de76d945e35fa35" 14SRCREV = "57c618f52008a402998a0cb7b66e5f046a36450c"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 9f76616b..fd2d0283 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 = "d3eb54e30943a69c469732f9184cbbad944fef28" 22SRCREV = "be53414956ddcdf3174793d8cf64327d5c6e13d7"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index c00f47c9..3ba90eb5 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 = "620eeaaa5bf3af1b5c1760042d1c369d21ad2a8f" 11SRCREV = "a315402ab232e3e4398f0b1c1d6910bdcefaec4f"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 33afe4b9..61e6e274 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -16,7 +16,7 @@ SRC_URI += "file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.pat
16 file://0001-Use-python3-explicitly.patch \ 16 file://0001-Use-python3-explicitly.patch \
17 " 17 "
18 18
19DEPENDS += "qtbase" 19DEPENDS += "qtbase qtdeclarative-native"
20 20
21PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" 21PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}"
22PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" 22PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug"
@@ -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 = "289c0fdc2cafd79e3178a9cd3cfc6c5bd53c8336" 31SRCREV = "b6143c08077c7d692fad9daa628f3ded8fa97f68"
32 32
33BBCLASSEXTEND =+ "native nativesdk" 33BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index b7540c59..f0b7eaf0 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 = "abfb7b84d33726fa7b5fdff29371569018afdf8f" 28SRCREV = "b4e0c6a2b046985caa907fe2888245962d03e79b"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 8c0ccb93..3166081e 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 = "912f7c727a4362c9530804d9bf1fd92062734af1" 38SRCREV_qtlocation = "f90be1068d21580be634fb50ce15dc32185ec138"
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 bcb26106..c185cfb6 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 = "c279feb00c3923f8cab8982bdedc3662fa2b43ad" 12SRCREV = "68904322f6c5db016f87432e6af4d6f926f7aa5d"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 99306eea..fec0a5be 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 = "e530c303d8d9164888f8d6e1a935b81cda8bf426" 40SRCREV = "836bde2ba1a3fc5bdce51aad839e07fb7584af35"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index ba3214ce..fa308610 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 = "2c954135f7f05aa0f0a05494ce60ab58520afc5d" 12SRCREV = "82263fbfc261e0c90caacdf42cae14e1c4bda8c5"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index a85f54c0..4f722f6d 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 = "690fb774ce2c78ff456f85a07c0ebcf3468b8515" 13SRCREV = "81e5ba03ebac141a8588ca0f5f1b96576f789611"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index b2d62ce4..f9f8a421 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \
21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ 21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
22" 22"
23 23
24SRCREV_qtquick3d = "30862c165996a153a9380ab5fa55768e30eb5c98" 24SRCREV_qtquick3d = "a3a9d0dcb721f8b4bdabfc8504679f1e839c1b88"
25SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" 25SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9"
26 26
27SRCREV_FORMAT = "qtquick3d_assimp" 27SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 97e61fdb..196c8383 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 = "ec686af14f817cc51323cfb01186f036905789c3" 13SRCREV = "729bf567eda304b52a7d0b120b1006b01bc84240"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index c98349e1..bd95eac5 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 = "1757766e9812337c0bddffd267baf04c332efd47" 20SRCREV = "d06862edd72ab1d9127a533de0f32499f831fb02"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index e2cabd7c..74d2ae34 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "afa84f528980af599e36c44523d9a489fa708dd7" 28SRCREV = "5a5cfcc1018554cbd8b268b379b44cd5ecaaa847"
29 29
30BBCLASSEXTEND += "native nativesdk" 30BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index c7c22f46..6da728a8 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 = "4579c6eba8ca323f98b25a5aa8032a771e857c2b" 39SRCREV = "b9168439a185755ef9110ffb898ab14f4e19cfcb"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 2592ce5a..7af997ee 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 = "a49c4f4cb16cd9e79ac97ab0178df0d9e49ec3f5" 13SRCREV = "d9885834b4c7b4f0d5c960282bf982c0fadf0e21"
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/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index a5a58a4b..83d7e4c6 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 = "5441a4cc3068eec15f01942331dc1aa094883963" 15SRCREV = "20befe6f00c84934a7ab9e9c27c8ac85cd0dac1d"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 2f660eca..58874dab 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 = "51d2ff5dd89bc7747298c93bd00bee908c6fba0e" 52SRCREV = "eac773c8dfd0e2166db53c88f5aa0c1e85933cac"
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 6c2e0f43..a9ae6a2a 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 = "ab5af4c676b80a69e0f1b8459d4c081a43f63313" 101SRCREV = "9d7437583d7475aa069ec5aa786fa9c5aa36253b"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 8baeea74..34406f4f 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 = "212ee5bc24c3e9de63d7e6a615f1a3a47eae0fc3" 74SRCREV = "10c4b6b501678ea49782375171fbcc97bacebfa4"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 432325c2..3779ffe5 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 = "957c0f52de83a0efe75b0ab33d1645799b892725" 42SRCREV = "a56852daeaa290cf93b7e38dd1238fa20dc72bba"
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 c3ec22fc..822b092b 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 = "237e90ec1cdaf6f91b82e663bd8bfccbaa2603e2" 15SRCREV = "8b8a11310687e7d22817d8d1a238cc51f04a8540"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 77f8ffba..6e643bee 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -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 = "09ce1e76716ca660ef6a9b39e4bb0015d03a0793" 183SRCREV_qtwebengine = "2d6458e6669b4c6e01b6836131cdf63c6c4993b7"
184SRCREV_chromium = "939daf833fff3a9901afb6fd65d02e0f057a494a" 184SRCREV_chromium = "3bbfff059e381412e2976b1e7dc1d6626280f0c0"
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 c060af25..75631952 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 = "f42b228928c3e51c46bdf0ef855b4832fa59817e" 14SRCREV = "51dd88d8963920b850d79e22b1820d207e0569c7"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 3bb26a27..4cdd8c45 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 = "9ba21cdd3079d9534863f120f8ef5e868ecd053d" 22SRCREV = "18ff92c2c596387bddeaeb6e66ded8e466862b7b"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 40cdcfbe..19b90593 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 = "b45d63e028345956256740307f2788b387188e1f" 28SRCREV = "e263fec484d23fc2e652f538f39934b5364339e1"
29 29
30BBCLASSEXTEND =+ "native nativesdk" 30BBCLASSEXTEND =+ "native nativesdk"
31 31