diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-05-27 15:22:21 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-05-27 15:54:32 +0200 |
| commit | b434031733b5fc0889ce89af669950f6b1cd9aa1 (patch) | |
| tree | 8084e310049308bb58ab9a603508ca17c9b61c96 /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | cfcd40e3d01bd2db8ec9617c8117b91fe7c41c8d (diff) | |
qt5: upgrade to 5.15.0
* https://www.qt.io/blog/qt-5.15-released
* continue to use latest revision in 5.15 (and 80-based) branch for
qtwebengine, because we were already using newer than v5.15.0 revision
and some of those fixes are needed for master (e.g. for build with gcc-10)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index e697470d..bd377569 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -145,7 +145,7 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "80-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 -# 5.15.meta-qt5.6 +# 5.15.meta-qt5.7 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ @@ -157,7 +157,7 @@ SRC_URI_append_libc-musl = "\ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based -# 80-based.meta-qt5.2 +# 80-based.meta-qt5.3 SRC_URI += " \ file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ @@ -190,8 +190,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "58cd21c0aa7a9dc5a18ea411dcf462a2ee8193f6" -SRCREV_chromium = "e941f2bda154c226bd2a1fd75efc8b1b7cee6a08" +SRCREV_qtwebengine = "f5268555099a1a96f8730035a40f04a473dd396e" +SRCREV_chromium = "7b2f027ea83c372c33d5b50deb65a2d98244aa04" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" |