diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-16 14:00:35 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-16 14:10:10 +0300 |
| commit | bfa0b787902fb791bc49e38572ee387a2e9913f0 (patch) | |
| tree | 36f2bdbc9e1811533511ba119829e7a77c96c7fa | |
| parent | 7a92b555e97bd8e24b8ffb143ba62628b2d6c58e (diff) | |
| download | meta-qt5-bfa0b787902fb791bc49e38572ee387a2e9913f0.tar.gz | |
qt5: update submodulesv5.15.0-beta4
Update to latest content in Qt 5.15 branch.
Change-Id: I97774db909f75c9fa84f45e5acc0905521e32173
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtquick3d_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttranslations_git.bb | 2 | ||||
| -rw-r--r-- | 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() { | |||
| 196 | do_generate_qt_environment_file[umask] = "022" | 196 | do_generate_qt_environment_file[umask] = "022" |
| 197 | addtask generate_qt_environment_file after do_install before do_package | 197 | addtask generate_qt_environment_file after do_install before do_package |
| 198 | 198 | ||
| 199 | SRCREV = "34adcabc6c294150ba530374fba5b05b43c1ca49" | 199 | 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() { | |||
| 36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | SRCREV = "51719ae6e726ef8a30e7d0ab3e84d97b2ca67857" | 39 | SRCREV = "9311799215228989a7da85c24a73e6757cc6731a" |
| 40 | 40 | ||
| 41 | BBCLASSEXTEND += "native nativesdk" | 41 | 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() { | |||
| 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 = "34adcabc6c294150ba530374fba5b05b43c1ca49" | 146 | 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 \ | |||
| 295 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 295 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
| 296 | } | 296 | } |
| 297 | 297 | ||
| 298 | SRCREV = "34adcabc6c294150ba530374fba5b05b43c1ca49" | 298 | 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() { | |||
| 31 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 31 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | SRCREV = "bf205b45a29ba80d94df3b6bac5fec4c7cd79bf9" | 34 | SRCREV = "574e74ffed00158ab0dc251c2789f4dccbf01eae" |
| 35 | 35 | ||
| 36 | BBCLASSEXTEND =+ "native nativesdk" | 36 | 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 += "\ | |||
| 38 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 38 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
| 39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 40 | 40 | ||
| 41 | SRCREV = "d0e0119251288c9c7224c5c6797a1377032aac2f" | 41 | SRCREV = "d5a1385c7df4714df571d7f80916708b47767a57" |
| 42 | 42 | ||
| 43 | # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory | 43 | # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory |
| 44 | do_install_append() { | 44 | 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 += " \ | |||
| 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 = "ba49d22e9dce12f2a85b91d4876d8e1aee0792df" | 24 | SRCREV_qtquick3d = "6b0defe7bd0ce54bd1b830f87cff08533e4aa591" |
| 25 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" | 25 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" |
| 26 | 26 | ||
| 27 | SRCREV_FORMAT = "qtquick3d_assimp" | 27 | 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 = " \ | |||
| 98 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ | 98 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ |
| 99 | " | 99 | " |
| 100 | 100 | ||
| 101 | SRCREV = "64adb8c01d477cec0b8fe3e3903778eb0c71a620" | 101 | 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 = "\ | |||
| 189 | file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 189 | file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
| 190 | " | 190 | " |
| 191 | 191 | ||
| 192 | SRCREV_qtwebengine = "e828423722cb57d55c0cb5fc66e3911b76197cd8" | 192 | SRCREV_qtwebengine = "e6d4d15b03fa67524269bc8e1beb04dcc704db03" |
| 193 | SRCREV_chromium = "6b151acc9f31574c7b739433c538b90b989c9a23" | 193 | SRCREV_chromium = "c81ff02d7fc7695a62d6543e34b73a75071f7d78" |
| 194 | SRCREV = "${SRCREV_qtwebengine}" | 194 | SRCREV = "${SRCREV_qtwebengine}" |
| 195 | 195 | ||
| 196 | SRCREV_FORMAT = "qtwebengine_chromium" | 196 | SRCREV_FORMAT = "qtwebengine_chromium" |
