aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt
diff options
context:
space:
mode:
authorJani Suonpera <jani.suonpera@qt.io>2021-08-25 12:16:15 +0300
committerJukka Jokiniva <jukka.jokiniva@qt.io>2021-08-25 11:43:19 +0000
commitb1f57c12296ea660777f953360c4a533e238d23e (patch)
treed2592a6c192b684f29eaba4c4ce9d2309be61e27 /recipes-qt
parent0e99e279dce8b87ddaa983f0fcc59e5524516b8e (diff)
qt5: update submodules for LTS 5.15.6
Task-number: QTBUG-94631 Change-Id: I6c1aa5010c1b19069ceba7f63714ad50b928f531 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qt5-lts.inc2
-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/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb4
8 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 7fceccab..7e594472 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -195,4 +195,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 = "8086bd3e9eabe95c1bc42635eddf875cb96d6124"
+SRCREV = "bbfbb18df18658e8ceec4bc04bd2cdf59f6a35ed"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index a2c9ca27..5cd011f5 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
# Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com>
QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.15"
+QT_MODULE_BRANCH ?= "5.15.6"
QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
QT_MODULE_REPO ?= "${QT_MODULE}.git"
diff --git a/recipes-qt/qt5/qt5-lts.inc b/recipes-qt/qt5/qt5-lts.inc
index 0a5a3abe..30c4a591 100644
--- a/recipes-qt/qt5/qt5-lts.inc
+++ b/recipes-qt/qt5/qt5-lts.inc
@@ -4,7 +4,7 @@ QT_LTS_GIT ?= "git://codereview.qt-project.org/${QT_GIT_PROJECT}"
QT_GIT = "${QT_LTS_GIT}"
QT_LTS_GIT_PROTOCOL ?= "ssh"
QT_GIT_PROTOCOL = "${QT_LTS_GIT_PROTOCOL}"
-QT_MODULE_BRANCH = "tqtc/lts-5.15"
+QT_MODULE_BRANCH = "tqtc/lts-5.15.6"
QT_LTS_MODULE_REPO ?= "tqtc-${QT_MODULE}.git"
QT_MODULE_REPO = "${QT_LTS_MODULE_REPO}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 07099e46..ed84fc27 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -142,4 +142,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 = "8086bd3e9eabe95c1bc42635eddf875cb96d6124"
+SRCREV = "bbfbb18df18658e8ceec4bc04bd2cdf59f6a35ed"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index ad5a839f..2a07f2b1 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -302,4 +302,4 @@ sed -i \
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
}
-SRCREV = "8086bd3e9eabe95c1bc42635eddf875cb96d6124"
+SRCREV = "bbfbb18df18658e8ceec4bc04bd2cdf59f6a35ed"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index a5459bc6..4dae2ed6 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -32,6 +32,6 @@ do_install_append_class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
-SRCREV = "32072884bdba99205d7f681382b0fcf83d292c6d"
+SRCREV = "eaf011c4ae440bbf7a02ceb7a33be5dfa5bcf907"
BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 94fc8fd3..6f5fa500 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtdeclarative-native"
-SRCREV = "2961c877cc3f41a5668be2841b1ea884556b6a94"
+SRCREV = "05522a30193a3090dd7cae26b36d675ae1f18e08"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 17f33d20..e03722c2 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -194,8 +194,8 @@ SRC_URI_append_libc-musl = "\
file://chromium/0025-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
"
-SRCREV_qtwebengine = "c684572390c086093f8ecfcb61d41b04c6faa340"
-SRCREV_chromium = "24fe4f7088e51adf8a06d666c488c993e8295e05"
+SRCREV_qtwebengine = "2acbba86362ac3a1c2d8c20390dc263875f8f09c"
+SRCREV_chromium = "9f71911e38c041cedc5291c5e772b7d03ce8b8c8"
SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine_chromium"