summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bb
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-08-07 10:27:09 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2019-08-13 12:03:25 +0000
commit7388cd427d99ac7920394a31f176c0eb92521837 (patch)
tree82fc75b5ab0861a1f68fc52373660270a6818b21 /recipes-qt/qt5/qtwebengine_git.bb
parent77ba83f3fbf777add748a437b80c19c6a1a5f989 (diff)
downloadmeta-qt5-7388cd427d99ac7920394a31f176c0eb92521837.tar.gz
meta-qt5: update submodules
Change-Id: I4ec55015ee1006f7a61049bf1a8442476f129a8e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb8
1 files changed, 3 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 3d4e20d3..5ffabdc6 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -132,15 +132,13 @@ RDEPENDS_${PN}-examples += " \
132 qtdeclarative-qmlplugins \ 132 qtdeclarative-qmlplugins \
133" 133"
134 134
135QT_MODULE_BRANCH_CHROMIUM = "73-based" 135QT_MODULE_BRANCH_CHROMIUM = "75-based"
136 136
137# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12 137# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12
138# 5.12.meta-qt5.4 138# 5.12.meta-qt5.4
139SRC_URI += " \ 139SRC_URI += " \
140 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 140 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
141 file://0001-Force-host-toolchain-configuration.patch \ 141 file://0001-Force-host-toolchain-configuration.patch \
142 file://0004-Fix-linker-too-long-argument-list.patch \
143 file://0005-Make-linker-call-look-great-again.patch \
144" 142"
145SRC_URI_append_libc-musl = "\ 143SRC_URI_append_libc-musl = "\
146 file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ 144 file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
@@ -174,8 +172,8 @@ SRC_URI_append_libc-musl = "\
174 file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 172 file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
175" 173"
176 174
177SRCREV_qtwebengine = "a69029cf9fcfd0c1fcdaafe5cbcbff2d5dd6b5c5" 175SRCREV_qtwebengine = "33a2c9aed3ee621c91853570087b500c830792e0"
178SRCREV_chromium = "82d848eb4fe3aae8c72a91b2d30c91b407ac5593" 176SRCREV_chromium = "f5613a4bc321972b8f72654d4c4bc9ba0c36ffbe"
179SRCREV = "${SRCREV_qtwebengine}" 177SRCREV = "${SRCREV_qtwebengine}"
180 178
181SRCREV_FORMAT = "qtwebengine_chromium" 179SRCREV_FORMAT = "qtwebengine_chromium"