diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-13 15:51:23 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-15 08:57:57 +0200 |
commit | 07393133a7c0c27c71a24da5ec09834281fd0f13 (patch) | |
tree | 98a1c1471053a53a0d40f82e82c3d0afdb801664 | |
parent | 15ce669550e7ee0dae4d16e7cd26d03e7a7a1cf4 (diff) | |
download | meta-qt5-07393133a7c0c27c71a24da5ec09834281fd0f13.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.15 branch.
Task-number: QTBUG-80823
Change-Id: I6bc319302edc111255d01e6ecb9b9d6711d7a0ed
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
42 files changed, 50 insertions, 48 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 2a3778cf..ae6a7c2f 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -152,7 +152,8 @@ do_install() { | |||
152 | # remove things unused in nativesdk, we need the headers and libs | 152 | # remove things unused in nativesdk, we need the headers and libs |
153 | rm -rf ${D}${datadir} \ | 153 | rm -rf ${D}${datadir} \ |
154 | ${D}${libdir}/cmake \ | 154 | ${D}${libdir}/cmake \ |
155 | ${D}${libdir}/pkgconfig | 155 | ${D}${libdir}/pkgconfig \ |
156 | ${D}${libdir}/metatypes \ | ||
156 | 157 | ||
157 | # Install CMake's toolchain configuration | 158 | # Install CMake's toolchain configuration |
158 | mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ | 159 | mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ |
@@ -195,4 +196,4 @@ fakeroot do_generate_qt_environment_file() { | |||
195 | do_generate_qt_environment_file[umask] = "022" | 196 | do_generate_qt_environment_file[umask] = "022" |
196 | addtask generate_qt_environment_file after do_install before do_package | 197 | addtask generate_qt_environment_file after do_install before do_package |
197 | 198 | ||
198 | SRCREV = "3c7df4a0ff91a833cf77e38ab8ccd65e289242e9" | 199 | SRCREV = "663d00c71697a3383d9b3f3bb42b72c3d8eeaa05" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 05c0df55..2b444ad2 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 | ||
39 | SRCREV = "bfeba7c431fd7bebbf7163853cb2e6a327e188aa" | 39 | SRCREV = "7d0bcdb027826997b76f84f25e9eb06ea365205c" |
40 | 40 | ||
41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 6f9a83c4..c6d1ea71 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc | |||
@@ -134,6 +134,7 @@ FILES_${PN} += " \ | |||
134 | FILES_${PN}-dev += " \ | 134 | FILES_${PN}-dev += " \ |
135 | ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \ | 135 | ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \ |
136 | ${OE_QMAKE_PATH_LIBS}/pkgconfig \ | 136 | ${OE_QMAKE_PATH_LIBS}/pkgconfig \ |
137 | ${OE_QMAKE_PATH_LIBS}/metatypes \ | ||
137 | ${OE_QMAKE_PATH_LIBS}/cmake/* \ | 138 | ${OE_QMAKE_PATH_LIBS}/cmake/* \ |
138 | ${OE_QMAKE_PATH_LIBS}/*.prl \ | 139 | ${OE_QMAKE_PATH_LIBS}/*.prl \ |
139 | ${OE_QMAKE_PATH_LIBS}/*.la \ | 140 | ${OE_QMAKE_PATH_LIBS}/*.la \ |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index d89a2b40..4dc3b97a 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 | ||
146 | SRCREV = "3c7df4a0ff91a833cf77e38ab8ccd65e289242e9" | 146 | SRCREV = "663d00c71697a3383d9b3f3bb42b72c3d8eeaa05" |
diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch index e0591d2a..48dfbca3 100644 --- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a080cb3ac2ad24aeb73407c772ed560dc4cb7ef5 Mon Sep 17 00:00:00 2001 | 1 | From 35c83da2aadb100be6b4474bbf02d32b78d9ad04 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Tue, 23 Oct 2018 09:54:57 +0300 | 3 | Date: Tue, 23 Oct 2018 09:54:57 +0300 |
4 | Subject: [PATCH] Disable ltcg for host_build | 4 | Subject: [PATCH] Disable ltcg for host_build |
@@ -15,7 +15,7 @@ Upstream-Status: Inappropriate [embedded specific] | |||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf | 17 | diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf |
18 | index a94f6d0eeb..3cb01c334d 100644 | 18 | index d81f340edd..dc1d196710 100644 |
19 | --- a/mkspecs/features/ltcg.prf | 19 | --- a/mkspecs/features/ltcg.prf |
20 | +++ b/mkspecs/features/ltcg.prf | 20 | +++ b/mkspecs/features/ltcg.prf |
21 | @@ -1,6 +1,6 @@ | 21 | @@ -1,6 +1,6 @@ |
@@ -23,6 +23,6 @@ index a94f6d0eeb..3cb01c334d 100644 | |||
23 | # Static library but no-static-ltcg enabled: skip LTCG | 23 | # Static library but no-static-ltcg enabled: skip LTCG |
24 | -} else: CONFIG(release, debug|release) { | 24 | -} else: CONFIG(release, debug|release) { |
25 | +} else: CONFIG(release, debug|release):!host_build { | 25 | +} else: CONFIG(release, debug|release):!host_build { |
26 | # We need fat object files when creating static libraries on some platforms | 26 | separate_debug_info { |
27 | # so the linker will know to load a particular object from the library | 27 | # Evaluate single-$ variable references that have no valid value at mkspec loading time |
28 | # in the first place. On others, we have special ar and nm to create the symbol | 28 | QMAKE_LFLAGS_LTCG_SEPARATE_DEBUG_INFO ~= s/\\$\\{/\$\$\{/ |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 044297dd..a3710edf 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 | ||
296 | SRCREV = "3c7df4a0ff91a833cf77e38ab8ccd65e289242e9" | 296 | SRCREV = "663d00c71697a3383d9b3f3bb42b72c3d8eeaa05" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 5a4d079c..9169516a 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
10 | 10 | ||
11 | SRCREV = "4b534d99fe687c40fb9dd08de6b4f7ebadfb9135" | 11 | SRCREV = "354bda2ae41feb157c890766e2abcbc8be07f101" |
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 98446005..579a7308 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb | |||
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" | |||
11 | 11 | ||
12 | DEPENDS += "qtbase" | 12 | DEPENDS += "qtbase" |
13 | 13 | ||
14 | SRCREV = "a7bfc7ebb30dd45e4692ec38d8b9ede6372939f0" | 14 | SRCREV = "f20d16c3809cf5641d597c2a8de76d945e35fa35" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 6f463733..9f76616b 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 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "797a6414bbacb9cdd0a8b4ff1b1751de09119660" | 22 | SRCREV = "d3eb54e30943a69c469732f9184cbbad944fef28" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index ac3cd941..c00f47c9 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
10 | 10 | ||
11 | SRCREV = "2900ec11a8100e474f3b595848314b894ecb2079" | 11 | SRCREV = "620eeaaa5bf3af1b5c1760042d1c369d21ad2a8f" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 134f232b..22b05f35 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -29,6 +29,6 @@ do_install_append_class-nativesdk() { | |||
29 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 29 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
30 | } | 30 | } |
31 | 31 | ||
32 | SRCREV = "a428a2199f4ce75d68585cabe3471356933fa404" | 32 | SRCREV = "289c0fdc2cafd79e3178a9cd3cfc6c5bd53c8336" |
33 | 33 | ||
34 | BBCLASSEXTEND =+ "native nativesdk" | 34 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 1ec882be..9d87920c 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 | ||
15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
16 | 16 | ||
17 | SRCREV = "9359fd8c0657a80ca5add1fd2ff9a5eb7b75cfa3" | 17 | SRCREV = "e2fe789f1055835c92ece16646edff892e0f4d9c" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 6a253747..1149fe3e 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/ |
19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
20 | 20 | ||
21 | SRCREV = "ec61d1469d0cbfc9c8edb60fe3c78d6702aa79a8" | 21 | SRCREV = "1466b9792e6c61eebb767717a1298f240899e8c3" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 9128ade7..b7540c59 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 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "0d150412b607680ea6ce79baf60c2d2709d5f057" | 28 | SRCREV = "abfb7b84d33726fa7b5fdff29371569018afdf8f" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 7cbcf895..0f07de7c 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "35f6e58cd747a3d19a503c7fa49bb74aeaedd87e" | 12 | SRCREV = "9f8d1c7c333651035a7802f434a6376072173685" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index f9b14834..8c0ccb93 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 | ||
38 | SRCREV_qtlocation = "741d90b31650d71d7ea7a7cc9e83b1ab36e060c5" | 38 | SRCREV_qtlocation = "912f7c727a4362c9530804d9bf1fd92062734af1" |
39 | SRCREV_qtlocation-mapboxgl = "5233c75b3f6c73623c5473b2d6573f31f3ddb4b7" | 39 | SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb" |
40 | 40 | ||
41 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 41 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index 7b72601c..e4e896b7 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase qtdeclarative" | 10 | DEPENDS += "qtbase qtdeclarative" |
11 | 11 | ||
12 | SRCREV = "98a7aa119107bab9026a4c45dea0e0b0e959af84" | 12 | SRCREV = "e14d6cd4de7e2692da95511e8a2dc53fa30d1cc2" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index e01ea483..bcb26106 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "4e4050fdbdeab6e63c0b55947512a92845872930" | 12 | SRCREV = "c279feb00c3923f8cab8982bdedc3662fa2b43ad" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index c0f99952..99306eea 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/ |
38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
39 | 39 | ||
40 | SRCREV = "5c0cca78f410e8a89d3216aeba916d73070398f4" | 40 | SRCREV = "e530c303d8d9164888f8d6e1a935b81cda8bf426" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 2a1bf553..ba3214ce 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 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "40b0dbbd02fa16396bd27c40fd51f8840d6bfbea" | 12 | SRCREV = "2c954135f7f05aa0f0a05494ce60ab58520afc5d" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index f5596e42..4dac0519 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" | |||
18 | 18 | ||
19 | DEPENDS += "qtbase" | 19 | DEPENDS += "qtbase" |
20 | 20 | ||
21 | SRCREV = "96be231060829ed8c7afb2c7fd6df78d74417251" | 21 | SRCREV = "220a1cb6c5c7adc1c61f9a086128de178aec8e52" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 6577c879..a85f54c0 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "5abe17167b1236f9efd3ae074dadb7cfd5e1e76e" | 13 | SRCREV = "690fb774ce2c78ff456f85a07c0ebcf3468b8515" |
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index 0851758b..b2d62ce4 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 | ||
24 | SRCREV_qtquick3d = "746a7653609a5cbcda6a49213aefef5c0a514f2f" | 24 | SRCREV_qtquick3d = "30862c165996a153a9380ab5fa55768e30eb5c98" |
25 | SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" | 25 | SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" |
26 | 26 | ||
27 | SRCREV_FORMAT = "qtquick3d_assimp" | 27 | SRCREV_FORMAT = "qtquick3d_assimp" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 787a6cfd..97e61fdb 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
12 | 12 | ||
13 | SRCREV = "611422b5968ceac6cfba034116a3d1e107d8e2df" | 13 | SRCREV = "ec686af14f817cc51323cfb01186f036905789c3" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 0c6997b7..c98349e1 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 | ||
20 | SRCREV = "e6182202ba0bb93fa62ce1a54159501823046c37" | 20 | SRCREV = "1757766e9812337c0bddffd267baf04c332efd47" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 1a510f00..e2cabd7c 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 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "7c5e9803c0a35010e5bdea30ac05819560dd8e90" | 28 | SRCREV = "afa84f528980af599e36c44523d9a489fa708dd7" |
29 | 29 | ||
30 | BBCLASSEXTEND += "native nativesdk" | 30 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 76ba0263..c7c22f46 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/ |
37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
38 | 38 | ||
39 | SRCREV = "3c20a81bf02902cd57c7a188555cd33359b27f27" | 39 | SRCREV = "4579c6eba8ca323f98b25a5aa8032a771e857c2b" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index eab34409..2592ce5a 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 | ||
11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
12 | 12 | ||
13 | SRCREV = "a84f5f9d10b59606fabbe3448c8e619e6694565a" | 13 | SRCREV = "a49c4f4cb16cd9e79ac97ab0178df0d9e49ec3f5" |
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 79e9257b..f10a939f 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase qtdeclarative" | 13 | DEPENDS += "qtbase qtdeclarative" |
14 | 14 | ||
15 | SRCREV = "1560cbe6e0935dcb900be403ed414d293739d5b3" | 15 | SRCREV = "1c4e3b3c81c24a16f5d19934ad671fa4eb047784" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 1548ef3a..b1b4d794 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "bdff94ba65a22cb1edf4be15459c128c5de146bc" | 14 | SRCREV = "2032431ebdf9a2b26ddb6cfb79f7da4bd53fa5f0" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index c696551c..b5e1ca8b 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "dd22f6091527902d92568f6ec2a27e8c8d52f17c" | 15 | SRCREV = "0d28f55d79214e6bd343dc0b7459644168b0c290" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 9187efc2..a5a58a4b 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "ab818cbbeb7acab61eee3a4694457ceba8c35981" | 15 | SRCREV = "5441a4cc3068eec15f01942331dc1aa094883963" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index aff9484a..a5da1ddb 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -40,7 +40,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\ | |||
40 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ | 40 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ |
41 | " | 41 | " |
42 | 42 | ||
43 | SRCREV = "6ae18c04ceae3668536ae2016f0b3d1d7cf75b01" | 43 | SRCREV = "51d2ff5dd89bc7747298c93bd00bee908c6fba0e" |
44 | 44 | ||
45 | BBCLASSEXTEND = "native nativesdk" | 45 | BBCLASSEXTEND = "native nativesdk" |
46 | 46 | ||
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 31f75429..8baeea74 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 | ||
72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
73 | 73 | ||
74 | SRCREV = "dbd8eb64fb444c9a8c2658a6d514b32167beca55" | 74 | SRCREV = "212ee5bc24c3e9de63d7e6a615f1a3a47eae0fc3" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 0d8b5b92..432325c2 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 | ||
40 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 40 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
41 | 41 | ||
42 | SRCREV = "8d1fedd6781babaf130486e5c7192b0ebc9fb039" | 42 | SRCREV = "957c0f52de83a0efe75b0ab33d1645799b892725" |
43 | 43 | ||
44 | BBCLASSEXTEND =+ "native nativesdk" | 44 | BBCLASSEXTEND =+ "native nativesdk" |
45 | 45 | ||
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 6b13c6e3..c3ec22fc 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtdeclarative qtwebsockets" | 13 | DEPENDS += "qtdeclarative qtwebsockets" |
14 | 14 | ||
15 | SRCREV = "272ff9e83e030e7f8595da1b4850d3883165acfd" | 15 | SRCREV = "237e90ec1cdaf6f91b82e663bd8bfccbaa2603e2" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index aaebc5af..9ef729e2 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -178,8 +178,8 @@ SRC_URI_append_libc-musl = "\ | |||
178 | file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 178 | file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
179 | " | 179 | " |
180 | 180 | ||
181 | SRCREV_qtwebengine = "06a04f4acbde2f6ae966c450014102120b887d6a" | 181 | SRCREV_qtwebengine = "09ce1e76716ca660ef6a9b39e4bb0015d03a0793" |
182 | SRCREV_chromium = "88a931558e2e960eacccb32483713fcc4bbaf433" | 182 | SRCREV_chromium = "939daf833fff3a9901afb6fd65d02e0f057a494a" |
183 | SRCREV = "${SRCREV_qtwebengine}" | 183 | SRCREV = "${SRCREV_qtwebengine}" |
184 | 184 | ||
185 | SRCREV_FORMAT = "qtwebengine_chromium" | 185 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 890c9123..a2cd29e7 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb | |||
@@ -18,4 +18,4 @@ do_configure_prepend() { | |||
18 | 18 | ||
19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
20 | 20 | ||
21 | SRCREV = "1714aa0211057e79d1885c5b93d82993fefe1197" | 21 | SRCREV = "e15365c065955e62053441f1b386492da231cc1d" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index c6b312aa..c060af25 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "0964522a491ba3e96742594fec1eeef3a41e00ac" | 14 | SRCREV = "f42b228928c3e51c46bdf0ef855b4832fa59817e" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 28cc6fa0..3bb26a27 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
21 | 21 | ||
22 | SRCREV = "b0bfad9b87e57ef3dcec3fe68df9e89a0bda268e" | 22 | SRCREV = "9ba21cdd3079d9534863f120f8ef5e868ecd053d" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index af2f9d22..9b85bd19 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "e80a767b813fc1becc206def56e9a48a01f674e2" | 15 | SRCREV = "d6e4f960f7aa9e934caf9d948aad49101f662864" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index a98c5008..40cdcfbe 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -25,7 +25,7 @@ do_configure_prepend() { | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
27 | 27 | ||
28 | SRCREV = "be8f937b9bae96fbfe36135670997b9124b09b24" | 28 | SRCREV = "b45d63e028345956256740307f2788b387188e1f" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
31 | 31 | ||