diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-06-22 09:16:51 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-06-27 14:35:17 +0300 |
| commit | e4cf781941b1fe1445659ac645df0a4c3a0c3e0a (patch) | |
| tree | f36c9ade53442cc88f3677acc5bf7655ff28b362 | |
| parent | e6723628968ff883c386160ee21556204cf5f447 (diff) | |
qt5: update submodules
Update to latest content in lts-5.15.15 branch.
Task-number: QTBUG-113945
Change-Id: I21dba52f09b7d3d34c21b05e66b8c1af7d83581e
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/qt5-git.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt5-lts.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtpdf_git.bb | 4 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index f7fc1993..385baf40 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.15" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" QT_MODULE_REPO ?= "${QT_MODULE}.git" diff --git a/recipes-qt/qt5/qt5-lts.inc b/recipes-qt/qt5/qt5-lts.inc index a17318fd..b6573e76 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.14" +QT_MODULE_BRANCH = "tqtc/lts-5.15.15" QT_LTS_MODULE_REPO ?= "tqtc-${QT_MODULE}.git" QT_MODULE_REPO = "${QT_LTS_MODULE_REPO}" diff --git a/recipes-qt/qt5/qtpdf_git.bb b/recipes-qt/qt5/qtpdf_git.bb index 6c2e3534..7c02f047 100644 --- a/recipes-qt/qt5/qtpdf_git.bb +++ b/recipes-qt/qt5/qtpdf_git.bb @@ -182,8 +182,8 @@ SRC_URI:append:libc-musl = "\ file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "43863f59f4c7fc0f3e89292e7669e9fe4ae67efa" -SRCREV_chromium = "18c9261dc5b8aa57a0bdd5b62ce6f648cca1ef5e" +SRCREV_qtwebengine = "c0b33e73cabeff31ba035932e49d7977880ef9fc" +SRCREV_chromium = "1104ce16c83cae1d6f953a96f1968fe2771ae0fb" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 771ca4a9..17bc6c8a 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -39,7 +39,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ " -SRCREV = "2b5d9de99bc6d9301df34253b70d31bb7b0b427c" +SRCREV = "c04dd17219a80edff46ea87fe2f4f9fe1d3496fe" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index fde5dc28..15bd1ef5 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -198,8 +198,8 @@ SRC_URI:append:libc-musl = "\ file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "43863f59f4c7fc0f3e89292e7669e9fe4ae67efa" -SRCREV_chromium = "18c9261dc5b8aa57a0bdd5b62ce6f648cca1ef5e" +SRCREV_qtwebengine = "c0b33e73cabeff31ba035932e49d7977880ef9fc" +SRCREV_chromium = "1104ce16c83cae1d6f953a96f1968fe2771ae0fb" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" |