diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-03 15:05:29 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-08 05:26:52 +0000 |
commit | 119a5bde5b852f663f7c1f0cd720a810a29db2a4 (patch) | |
tree | 8178565863090759a905a6cff65031de986f0a19 /recipes-qt/qt5/qtwebengine_git.bb | |
parent | 7b03a69d33cf7887d2c202b38716d04433318b1d (diff) | |
download | meta-qt5-119a5bde5b852f663f7c1f0cd720a810a29db2a4.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.13.0 beta2 branch
Task-number: QTBUG-72311
Change-Id: I6b7a6629412bb595d5e668ce28d95e3dee45345c
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.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 869b5a3d..bf51b592 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -132,7 +132,7 @@ RDEPENDS_${PN}-examples += " \ | |||
132 | qtdeclarative-qmlplugins \ | 132 | qtdeclarative-qmlplugins \ |
133 | " | 133 | " |
134 | 134 | ||
135 | QT_MODULE_BRANCH_CHROMIUM = "71-based" | 135 | QT_MODULE_BRANCH_CHROMIUM = "73-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.2 | 138 | # 5.12.meta-qt5.2 |
@@ -149,7 +149,6 @@ SRC_URI_append_libc-musl = "\ | |||
149 | # 69-based.meta-qt5.3 | 149 | # 69-based.meta-qt5.3 |
150 | SRC_URI += " \ | 150 | SRC_URI += " \ |
151 | file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ | 151 | file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ |
152 | file://chromium/0003-chromium-Fix-build-with-gcc8.patch;patchdir=src/3rdparty \ | ||
153 | file://chromium/0004-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ | 152 | file://chromium/0004-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ |
154 | file://chromium/0019-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ | 153 | file://chromium/0019-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ |
155 | file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ | 154 | file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ |
@@ -172,8 +171,8 @@ SRC_URI_append_libc-musl = "\ | |||
172 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 171 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
173 | " | 172 | " |
174 | 173 | ||
175 | SRCREV_qtwebengine = "f3f3279bec367bf3816377ac31a75c042648068f" | 174 | SRCREV_qtwebengine = "2c5ec78fe8860e5bd0447675f715d2798baf89f2" |
176 | SRCREV_chromium = "0aae24c2876d19946ce0d28adc38c3dbed2c6549" | 175 | SRCREV_chromium = "3d95374cb8de20b3e15538f1ecb5b78bf9d1cdcb" |
177 | SRCREV = "${SRCREV_qtwebengine}" | 176 | SRCREV = "${SRCREV_qtwebengine}" |
178 | 177 | ||
179 | SRCREV_FORMAT = "qtwebengine_chromium" | 178 | SRCREV_FORMAT = "qtwebengine_chromium" |