diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-30 12:10:07 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-02-04 23:10:03 +0200 |
| commit | 27c10f248765d736bc45fd7d9ff6afd609a804fc (patch) | |
| tree | 9f1d2d9e98f240d8857d64fd30975853177f8cbe /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | c017b5dc4c3d3e59f64c3beb7316335f6d341ee4 (diff) | |
| download | meta-qt5-27c10f248765d736bc45fd7d9ff6afd609a804fc.tar.gz | |
qt5: update submodules
* Update to latest content in Qt 5.15 branch
* Exclude qtwebkit recipe from CI & toolchain as it does not build
with latest 5.15 content
* Remove qtwebkit dependency in qtcreator recipe, it is not needed
anymore
Task-number: QTBUG-80823
Change-Id: I4e98c56749f5f5cd24efbd1e021b39e3947954a5
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 77f8ffba..6e643bee 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -180,8 +180,8 @@ SRC_URI_append_libc-musl = "\ | |||
| 180 | file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 180 | file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
| 181 | " | 181 | " |
| 182 | 182 | ||
| 183 | SRCREV_qtwebengine = "09ce1e76716ca660ef6a9b39e4bb0015d03a0793" | 183 | SRCREV_qtwebengine = "2d6458e6669b4c6e01b6836131cdf63c6c4993b7" |
| 184 | SRCREV_chromium = "939daf833fff3a9901afb6fd65d02e0f057a494a" | 184 | SRCREV_chromium = "3bbfff059e381412e2976b1e7dc1d6626280f0c0" |
| 185 | SRCREV = "${SRCREV_qtwebengine}" | 185 | SRCREV = "${SRCREV_qtwebengine}" |
| 186 | 186 | ||
| 187 | SRCREV_FORMAT = "qtwebengine_chromium" | 187 | SRCREV_FORMAT = "qtwebengine_chromium" |