From bfa0b787902fb791bc49e38572ee387a2e9913f0 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 16 Apr 2020 14:00:35 +0300 Subject: qt5: update submodules Update to latest content in Qt 5.15 branch. Change-Id: I97774db909f75c9fa84f45e5acc0905521e32173 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick3d_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 5bbbb3f5..0113183c 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() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "34adcabc6c294150ba530374fba5b05b43c1ca49" +SRCREV = "bfb9b02d3b36244dc19c94a5693071a738bac8a2" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index a12d3530..269a9158 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "51719ae6e726ef8a30e7d0ab3e84d97b2ca67857" +SRCREV = "9311799215228989a7da85c24a73e6757cc6731a" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index ed544f71..8c4c2063 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -143,4 +143,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 } -SRCREV = "34adcabc6c294150ba530374fba5b05b43c1ca49" +SRCREV = "bfb9b02d3b36244dc19c94a5693071a738bac8a2" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 64d26fb9..c09f4a30 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -295,4 +295,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "34adcabc6c294150ba530374fba5b05b43c1ca49" +SRCREV = "bfb9b02d3b36244dc19c94a5693071a738bac8a2" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index c6f12f7f..79a9d8b2 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -31,6 +31,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "bf205b45a29ba80d94df3b6bac5fec4c7cd79bf9" +SRCREV = "574e74ffed00158ab0dc251c2789f4dccbf01eae" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 1a4c57af..aa8f5e1f 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -38,7 +38,7 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "d0e0119251288c9c7224c5c6797a1377032aac2f" +SRCREV = "d5a1385c7df4714df571d7f80916708b47767a57" # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory do_install_append() { diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index 28cfd024..8752c043 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb @@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV_qtquick3d = "ba49d22e9dce12f2a85b91d4876d8e1aee0792df" +SRCREV_qtquick3d = "6b0defe7bd0ce54bd1b830f87cff08533e4aa591" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" SRCREV_FORMAT = "qtquick3d_assimp" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index a907ac81..7d19350d 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "64adb8c01d477cec0b8fe3e3903778eb0c71a620" +SRCREV = "95ece41082b43ec1b85e33074229941f4db71bb7" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 4f9b5c6e..253b53c7 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -189,8 +189,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "e828423722cb57d55c0cb5fc66e3911b76197cd8" -SRCREV_chromium = "6b151acc9f31574c7b739433c538b90b989c9a23" +SRCREV_qtwebengine = "e6d4d15b03fa67524269bc8e1beb04dcc704db03" +SRCREV_chromium = "c81ff02d7fc7695a62d6543e34b73a75071f7d78" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" -- cgit v1.2.3