summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-03-07 20:53:22 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-03-07 19:56:12 +0000
commit26205f49f51b5727d75bf8f02a894e04bf7b7942 (patch)
tree9c2276c6cbbbb109e2ed529096c43f1bcd82325f
parent126927ef1b7077e7b82cd26b8d35f381cf3ff3a9 (diff)
downloadmeta-qt5-26205f49f51b5727d75bf8f02a894e04bf7b7942.tar.gz
qt5: update submodulesv5.12.2
Update to Qt 5.12.2 (RC2) Task-number: QTBUG-73533 Change-Id: If890d5e95baecd16f3423ffb3c64f0caccaa6fad Reviewed-by: Antti Kokko <antti.kokko@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/qtwebengine_git.bb4
4 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index e312b44c..eedb01e4 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() {
193do_generate_qt_environment_file[umask] = "022" 193do_generate_qt_environment_file[umask] = "022"
194addtask generate_qt_environment_file after do_install before do_package 194addtask generate_qt_environment_file after do_install before do_package
195 195
196SRCREV = "e8d3306c8f86bf21648693521d8be91bb8f1335e" 196SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 3bc4f931..45b8f7b1 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -139,4 +139,4 @@ do_install() {
139 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 139 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
140} 140}
141 141
142SRCREV = "e8d3306c8f86bf21648693521d8be91bb8f1335e" 142SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 88f68a2f..943ab08e 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -263,4 +263,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
263 263
264RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 264RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
265 265
266SRCREV = "e8d3306c8f86bf21648693521d8be91bb8f1335e" 266SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index fb999c66..d6730cf9 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -174,8 +174,8 @@ SRC_URI_append_libc-musl = "\
174 file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 174 file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
175" 175"
176 176
177SRCREV_qtwebengine = "b47b28d3cfb8b249cce343031507864de99117a7" 177SRCREV_qtwebengine = "92b078a534390dba64a0dcebcffdab4ce24581b6"
178SRCREV_chromium = "493fab1afff5034cb5552455add3af3aaf41f9e9" 178SRCREV_chromium = "43316b156e65f867a76ed2afd96bf30696c5f4f6"
179SRCREV = "${SRCREV_qtwebengine}" 179SRCREV = "${SRCREV_qtwebengine}"
180 180
181SRCREV_FORMAT = "qtwebengine_chromium" 181SRCREV_FORMAT = "qtwebengine_chromium"