summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-03-25 09:13:08 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-03-25 10:24:59 +0200
commit6d8b91fea6150ac3bb53f3e0671d0158bee2e6ff (patch)
tree1ddd6f24972495e60ce5844a3b907d98451a755b
parentcbf2529a89af9ea853d0d73dc1439fa1af36d007 (diff)
downloadmeta-qt5-6d8b91fea6150ac3bb53f3e0671d0158bee2e6ff.tar.gz
qt5: update submodules
Update to latest content in Qt 5.14.2 branch. Task-number: QTBUG-81892 Change-Id: I418aa84295675f03461da69d443f69e2f27db391 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_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/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb4
5 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index cd7800d9..90b3616f 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() {
194do_generate_qt_environment_file[umask] = "022" 194do_generate_qt_environment_file[umask] = "022"
195addtask generate_qt_environment_file after do_install before do_package 195addtask generate_qt_environment_file after do_install before do_package
196 196
197SRCREV = "1a18e138f4d17c219c6ffd6e4396c30b960818b4" 197SRCREV = "bd78753d625c573eef587fc0b8e767cffb99c2bf"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 247b2626..24589d28 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -142,4 +142,4 @@ do_install() {
142 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 142 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
143} 143}
144 144
145SRCREV = "1a18e138f4d17c219c6ffd6e4396c30b960818b4" 145SRCREV = "bd78753d625c573eef587fc0b8e767cffb99c2bf"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 1cc39f78..bd1e8e5b 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -296,4 +296,4 @@ sed -i \
296 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 296 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
297} 297}
298 298
299SRCREV = "1a18e138f4d17c219c6ffd6e4396c30b960818b4" 299SRCREV = "bd78753d625c573eef587fc0b8e767cffb99c2bf"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 7a3bec77..fbd1b6f5 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -41,7 +41,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
41 41
42EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 42EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
43 43
44SRCREV = "3e79280ad234ad01c126f84ecfa1596fa12628a0" 44SRCREV = "af3976e5e788392ab2b0299c11036c18493d8d40"
45 45
46BBCLASSEXTEND =+ "native nativesdk" 46BBCLASSEXTEND =+ "native nativesdk"
47 47
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index bf91b8da..47153763 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/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 189 file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
190" 190"
191 191
192SRCREV_qtwebengine = "98af37969ec9cfd4eaa28884ea6d21dfbe008764" 192SRCREV_qtwebengine = "35aa6c30f0e766b8825519e04242b7a4c93b6e0e"
193SRCREV_chromium = "f7ffd2f7dffd911e37f6a638bb410bd71da23491" 193SRCREV_chromium = "6c9be50c2d901e66119679155fb3c7c9200448d1"
194SRCREV = "${SRCREV_qtwebengine}" 194SRCREV = "${SRCREV_qtwebengine}"
195 195
196SRCREV_FORMAT = "qtwebengine_chromium" 196SRCREV_FORMAT = "qtwebengine_chromium"