diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-26 06:48:43 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-05-02 21:24:26 +0000 |
commit | e6fb3850d43f857e87f7c53fc7df5933fef98cbd (patch) | |
tree | 9a2db0384fd5af8675225005466ccb801fa8c8ad | |
parent | f6373503a015b3a5b4f797c286dfc07e660cc20b (diff) |
qt5: update SRCREVs after v5.9.8 tags were downmerged to 5.9 branch
* there are only a few functional changes:
qtdeclarative:
9d6d2ee21 Use Los Angeles to represent PST8PDT, not Vancouver
qtimageformats:
11a7040 Update bundled libtiff to version 4.0.10
the rest are just change files
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
31 files changed, 31 insertions, 124 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index d7f58fd2..03151fbb 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -200,7 +200,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -# Use 159f7e9c39c57177d25f524ae3cad4e533b89da8 -# instead of 82eb6aa08e5dc8a57402b69b4e55ce7d2371e84b because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "159f7e9c39c57177d25f524ae3cad4e533b89da8" +SRCREV = "82eb6aa08e5dc8a57402b69b4e55ce7d2371e84b" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 56e94e89..6ff2e33e 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -37,9 +37,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -# Use 9e05583a8e95d578656fe32c83303f11b651e029 -# instead of 0d923f9fc31fe55006b5e72539bd20ec016ca856 -# because v5.9.8 wasn't merged to 5.9 branch yet -SRCREV = "9e05583a8e95d578656fe32c83303f11b651e029" +SRCREV = "0d923f9fc31fe55006b5e72539bd20ec016ca856" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 0e75f4fe..50aaab8d 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -125,7 +125,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -# Use 159f7e9c39c57177d25f524ae3cad4e533b89da8 -# instead of 82eb6aa08e5dc8a57402b69b4e55ce7d2371e84b because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "159f7e9c39c57177d25f524ae3cad4e533b89da8" +SRCREV = "82eb6aa08e5dc8a57402b69b4e55ce7d2371e84b" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 0276c881..dae5822c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -220,7 +220,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -# Use 159f7e9c39c57177d25f524ae3cad4e533b89da8 -# instead of 82eb6aa08e5dc8a57402b69b4e55ce7d2371e84b because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "159f7e9c39c57177d25f524ae3cad4e533b89da8" +SRCREV = "82eb6aa08e5dc8a57402b69b4e55ce7d2371e84b" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 894a1371..647a7e51 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -10,7 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -# Use 909a41f68455cf9f7e0d5ba14ca59641a18b6c6f -# instead of 2097038d94301c0a1e684c939d29bc24620ce3c4 -# because v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "909a41f68455cf9f7e0d5ba14ca59641a18b6c6f" +SRCREV = "2097038d94301c0a1e684c939d29bc24620ce3c4" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index a787164e..98c06718 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -# Use f7fb6e5b3c321c824d597363504cae6cf7d37c43 -# instead of ff7e0b5106a847541e13decfd8cbc57985d001b7 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "f7fb6e5b3c321c824d597363504cae6cf7d37c43" +SRCREV = "ff7e0b5106a847541e13decfd8cbc57985d001b7" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index f3d84af7..3fb5696d 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,7 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -# Use 3349d962e8ef1bbef4c72bacdd38854e7d3973a1 -# instead of cd4b17113017df0f9811aa2bd2add37a475a667f because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "3349d962e8ef1bbef4c72bacdd38854e7d3973a1" +SRCREV = "cd4b17113017df0f9811aa2bd2add37a475a667f" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 0e58a8e5..324145d6 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,7 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -# Use 46a49e34b9644da11f9e68d6ea3b45d586c711cf -# instead of 243106a56ff681ffefcf65af8ecd30fc14181200 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "46a49e34b9644da11f9e68d6ea3b45d586c711cf" +SRCREV = "243106a56ff681ffefcf65af8ecd30fc14181200" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index f027a147..d8ba657b 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -30,9 +30,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -# Use 24af53cfeb998dcf3a6c6d49d312e50809a4a324 -# instead of 145485bec922e9fb062e2b286916c98385e2e84d because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "24af53cfeb998dcf3a6c6d49d312e50809a4a324" +SRCREV = "145485bec922e9fb062e2b286916c98385e2e84d" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 17128161..088e7cd5 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,7 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -# Use 7da058990dd7ab2898f27300e2a3757069ecc1ca -# instead of 6f1dca6e8b183a42c7a428645196a9d305602077 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "7da058990dd7ab2898f27300e2a3757069ecc1ca" +SRCREV = "6f1dca6e8b183a42c7a428645196a9d305602077" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 0ae824d5..d802328e 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,7 +18,4 @@ RDEPENDS_${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -# Use 9f3378d1c6218d6fa49fba354026ee489c220e2e -# instead of 718e1e1f376ef990b998aa72e2029085e6b455be because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "9f3378d1c6218d6fa49fba354026ee489c220e2e" +SRCREV = "718e1e1f376ef990b998aa72e2029085e6b455be" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 9d161709..3322908c 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -26,7 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -# Use 23c609ea8de35f9bd6d9304ac8fde3138e02a75b -# instead of 50f78099ca9add9ba9ea5a3e464c864d5a98aee3 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "23c609ea8de35f9bd6d9304ac8fde3138e02a75b" +SRCREV = "50f78099ca9add9ba9ea5a3e464c864d5a98aee3" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 95358344..35e56d46 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -29,10 +29,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -# Use bdea5c63a0be0802bcb49b2fd30bac233a8ee50f -# instead of 3696006091d0536270c5f8499b19be12e54d841f because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV_qtlocation = "bdea5c63a0be0802bcb49b2fd30bac233a8ee50f" +SRCREV_qtlocation = "3696006091d0536270c5f8499b19be12e54d841f" SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 978416fe..d5356ff3 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -35,7 +35,4 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -# Use 2c22b9c106aee7df19c06f764b25f82ce844121a -# instead of b0df68530506e2b3b17365f07711d80dda6ff44c because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "2c22b9c106aee7df19c06f764b25f82ce844121a" +SRCREV = "b0df68530506e2b3b17365f07711d80dda6ff44c" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index de66a603..3da0cada 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,7 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -# Use 8b45a73ecac779969d491a19bbe0393f6328a3a6 -# instead of 1ef144bf3a324ac4bdea092a0b845cb483ec9a1d because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "8b45a73ecac779969d491a19bbe0393f6328a3a6" +SRCREV = "1ef144bf3a324ac4bdea092a0b845cb483ec9a1d" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index b8171ac2..083f98a5 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -19,7 +19,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -# Use 6bca42077ed4c50582d5f6b8d4e6f1a989a2081f -# instead of 8c3b97959cb2c157102994082dd2ba0e1985ced7 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "6bca42077ed4c50582d5f6b8d4e6f1a989a2081f" +SRCREV = "8c3b97959cb2c157102994082dd2ba0e1985ced7" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 33fa5bad..89f3c039 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -29,7 +29,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -# Use 8fa8656baa5ca3a9b7c170ef473d5b06d3e18ff8 -# instead of 4fe24b5f0d104976f361fd03e5398730bccc4c98 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "8fa8656baa5ca3a9b7c170ef473d5b06d3e18ff8" +SRCREV = "4fe24b5f0d104976f361fd03e5398730bccc4c98" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index a6f59f8d..fe23f04b 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,10 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -# Use 6e92327231c6d46bd9981fce33b4f33058287961 -# instead of f3448b881740eb72befe229999bd5bc8b48908ee because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "6e92327231c6d46bd9981fce33b4f33058287961" +SRCREV = "f3448b881740eb72befe229999bd5bc8b48908ee" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 # 5.9.meta-qt5.8 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 6c90e232..ee36a60e 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,7 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -# Use 268aa08850df9220dfd7e59ea6e7f40b36c4bdc2 -# instead of 247c06da51ee9cf7a91c01ae3b013690f9ab7809 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "268aa08850df9220dfd7e59ea6e7f40b36c4bdc2" +SRCREV = "247c06da51ee9cf7a91c01ae3b013690f9ab7809" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index d658a067..0da673a5 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,7 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -# Use d0cb148f1abb570ddbd3fb5360784e0287938f69 -# instead of fdc716e10ac630416c04275640daaa65d6c92dd8 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "d0cb148f1abb570ddbd3fb5360784e0287938f69" +SRCREV = "fdc716e10ac630416c04275640daaa65d6c92dd8" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 188697f8..48180a0d 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -15,7 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -# Use bc3a39de8f5340bb0827510f7d9eebe643bdfba8 -# instead of a5b4f0511006bfa4999beb0df094e11d25a4e6eb because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "bc3a39de8f5340bb0827510f7d9eebe643bdfba8" +SRCREV = "a5b4f0511006bfa4999beb0df094e11d25a4e6eb" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index dca4eea8..cf5280e8 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -13,7 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -# Use 87396c089f0695e05b50c6efe478a1062ff700b8 -# instead of 44de875f059c35c4819f331a2fae1ab52c81c62c because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "87396c089f0695e05b50c6efe478a1062ff700b8" +SRCREV = "44de875f059c35c4819f331a2fae1ab52c81c62c" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index ae30c945..7139499d 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -29,10 +29,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -# Use e8d9ac8ab166d2e740a0df480277397d3b8a1283 -# instead of cb4fb7bdd59bb57324893cf1b226f380d03b574f because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "e8d9ac8ab166d2e740a0df480277397d3b8a1283" +SRCREV = "cb4fb7bdd59bb57324893cf1b226f380d03b574f" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index ac772c3b..23bbfca8 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -53,7 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -# Use a2e7b8412f56841e12ed20a39f4a38e32d3c1e30 -# instead of dc18b608b5267ef7bce854aff6803a98137f43d2 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "a2e7b8412f56841e12ed20a39f4a38e32d3c1e30" +SRCREV = "dc18b608b5267ef7bce854aff6803a98137f43d2" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 5b6afe70..4e542cca 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,10 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -# Use 7ed01d849a6813b06e2ce5660fa494879f86e694 -# instead of 79ec94d0efbeabe485275e5c79c828aa64641afa because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "7ed01d849a6813b06e2ce5660fa494879f86e694" +SRCREV = "79ec94d0efbeabe485275e5c79c828aa64641afa" # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 # 5.9.meta-qt5.8 diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 0e65ce60..9b02e0d5 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,7 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -# Use 625a73dcbb50bf927c9559556d5db9d7996b92d0 -# instead of e23e37189fb78cb090c67fd01b187b7a59aa8c77 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "625a73dcbb50bf927c9559556d5db9d7996b92d0" +SRCREV = "e23e37189fb78cb090c67fd01b187b7a59aa8c77" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index e033b89f..37fab0bf 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -164,10 +164,7 @@ SRC_URI_append_libc-musl = "\ file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " -# Use 75283c0240c76b49dade0e2a6c9ad9339b5e2704 -# instead of 86f8a0dfa47fea0ba41c386a9753db94d8de3b54 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV_qtwebengine = "75283c0240c76b49dade0e2a6c9ad9339b5e2704" +SRCREV_qtwebengine = "86f8a0dfa47fea0ba41c386a9753db94d8de3b54" SRCREV_chromium = "45ed09101724148401a193e20e3545c8f3de4df2" SRCREV = "${SRCREV_qtwebengine}" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index b654318d..e61f8862 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,7 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -# Use 3a7a8c98a12569f133f7914118e13ec919f2e484 -# instead of b5d8a09e573ae5c194a962e84a31ef3251250258 because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "3a7a8c98a12569f133f7914118e13ec919f2e484" +SRCREV = "b5d8a09e573ae5c194a962e84a31ef3251250258" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index a2e20590..24298f80 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,7 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -# Use a3b5e85c924008e1968975825a0e61b040d6d88b -# instead of 6ea20e8930b02928a20173c1718ba5efd7b24dec because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "a3b5e85c924008e1968975825a0e61b040d6d88b" +SRCREV = "6ea20e8930b02928a20173c1718ba5efd7b24dec" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 1352c053..d3bbba28 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,7 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -# Use 3a798695bcda58b3884a9ba278aeca4c79f21ae0 -# instead of 078fef443e40b99098dc5a035ae6e4072682cdbe because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "3a798695bcda58b3884a9ba278aeca4c79f21ae0" +SRCREV = "078fef443e40b99098dc5a035ae6e4072682cdbe" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 1d3b3c22..900d0886 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -15,9 +15,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -# Use 2756d99c14c098a6732635843221550ba68b8840 -# instead of 03d89c93e98af5fe3341c4d634dfe675c2fefefa because -# v5.9.8 tag wasn't merged to 5.9 branch yet -SRCREV = "2756d99c14c098a6732635843221550ba68b8840" +SRCREV = "03d89c93e98af5fe3341c4d634dfe675c2fefefa" BBCLASSEXTEND =+ "native nativesdk" |