aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2022-09-28 08:49:11 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2022-09-28 13:12:58 +0300
commit8c4e23c1cabacafd0b5afa315abb5b8463d52ffe (patch)
tree44f267eadc57b772edfbc9c0cfff426f1baf70f8
parentc2c5d2cae3bf42f5159e755d715f94915ec2b066 (diff)
qt5: update submodulesv5.15.11-lts
Update to latest content in Qt 5.15.11 branch. Task-number: QTBUG-104247 Change-Id: Ic3ec49941a7395d5102d2483786cf83cf874e6fc Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-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/qtwebengine_git.bb2
7 files changed, 7 insertions, 7 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 35ce1824..895a7833 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -200,4 +200,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 = "7380edaeb81622d3685fb989809d03a5f2d95cfa"
+SRCREV = "a96fc76fa78f3500266b3a34016f9e1bd29b319c"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 12bdb1f5..df2e8c00 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
# Copyright (C) 2013-2022 Martin Jansa <martin.jansa@gmail.com>
QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.15"
+QT_MODULE_BRANCH ?= "5.15.11"
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 af611ce4..a99a85ea 100644
--- a/recipes-qt/qt5/qt5-lts.inc
+++ b/recipes-qt/qt5/qt5-lts.inc
@@ -4,6 +4,6 @@ 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.11"
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 baf57831..dece87d4 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 = "7380edaeb81622d3685fb989809d03a5f2d95cfa"
+SRCREV = "a96fc76fa78f3500266b3a34016f9e1bd29b319c"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 0fa8d9a0..3246bbb3 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -306,4 +306,4 @@ sed -i \
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
}
-SRCREV = "7380edaeb81622d3685fb989809d03a5f2d95cfa"
+SRCREV = "a96fc76fa78f3500266b3a34016f9e1bd29b319c"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 51216c3c..eb0eedf1 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -53,6 +53,6 @@ do_install:append:class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
-SRCREV = "8d6beb794058050fa750de74956d893db2491d3e"
+SRCREV = "cecf9b52904ab790e1a531698e9c5e33585227f0"
BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 88be4b5d..c5642c04 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -198,7 +198,7 @@ SRC_URI:append:libc-musl = "\
file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
"
-SRCREV_qtwebengine = "34363b9c0528e4a6920581e10c68eec44bbd470a"
+SRCREV_qtwebengine = "3d23b379a7c0a87922f9f5d9600fde8c4e58f1fd"
SRCREV_chromium = "be349eaf62e77955791d7bf29f893f1e8a37daf4"
SRCREV = "${SRCREV_qtwebengine}"