diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-25 12:44:03 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-05 15:43:26 +0000 |
commit | 5a604b0dec61ce4a9a14fc32b64c56afa703934e (patch) | |
tree | 7afdba29f0b3ef07a83352a1b91017e4e1dd6266 /recipes-qt/qt5/qtwebengine_git.bb | |
parent | f54526a31b240fc65193509686c38387570b45de (diff) | |
download | meta-qt5-5a604b0dec61ce4a9a14fc32b64c56afa703934e.tar.gz |
qt5: update submodules
Update to Qt 5.12.0 Beta4
* Removed old qtwebengine patches, seemingly fixed upstream long time ago in commits
fd247c68523c35b93a72b2046d3fd8367d391ce8 and
bae703a3f53126a8baac5ef957662e62ce00344a (QTBUG-52460)
Task-number: QTBUG-70847
Change-Id: If9037e1aab33a01e3a88645e826223e54a00d5bc
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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index b4e0bd4d..65b587be 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -137,8 +137,6 @@ QT_MODULE_BRANCH_CHROMIUM = "69-based" | |||
137 | # 5.11.meta-qt5.7 | 137 | # 5.11.meta-qt5.7 |
138 | SRC_URI += " \ | 138 | SRC_URI += " \ |
139 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 139 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
140 | file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ | ||
141 | file://0002-Include-dependency-to-QCoreApplication-translate.patch \ | ||
142 | file://0003-Force-host-toolchain-configuration.patch \ | 140 | file://0003-Force-host-toolchain-configuration.patch \ |
143 | file://0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \ | 141 | file://0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \ |
144 | " | 142 | " |
@@ -170,8 +168,8 @@ SRC_URI_append_libc-musl = "\ | |||
170 | file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch;patchdir=src/3rdparty \ | 168 | file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch;patchdir=src/3rdparty \ |
171 | " | 169 | " |
172 | 170 | ||
173 | SRCREV_qtwebengine = "e77ed6f1686dab1852106d2ffa5f74e7526dbce9" | 171 | SRCREV_qtwebengine = "8eda96bc8ae68387807e079cd557c98c4a452c4f" |
174 | SRCREV_chromium = "156c2b70ceef9a4464a5a241c9f816dea4fd3168" | 172 | SRCREV_chromium = "d521ec6dd1ed0114b9c6d32b047fb024420a6cda" |
175 | SRCREV = "${SRCREV_qtwebengine}" | 173 | SRCREV = "${SRCREV_qtwebengine}" |
176 | 174 | ||
177 | SRCREV_FORMAT = "qtwebengine_chromium" | 175 | SRCREV_FORMAT = "qtwebengine_chromium" |