aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-06-10 10:56:40 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-10 10:57:11 +0000
commit731334ac1d46e877204e94154014fe49f41a0dc1 (patch)
tree1bb8f8609f52ace11c52c8437a69099a93cca97f /recipes-qt/qt5/qtwebengine_git.bb
parent70ce9802e4717e3cb166a477e8bd22abf05fa850 (diff)
qtwebengine: fix build with plugins as well as ozone enabled
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.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 24c8a775..db98ee37 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -124,16 +124,17 @@ RDEPENDS_${PN}-examples += " \
QT_MODULE_BRANCH_CHROMIUM = "65-based"
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11
-# 5.11.meta-qt5.3
+# 5.11.meta-qt5.5
SRC_URI += " \
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
file://0002-Include-dependency-to-QCoreApplication-translate.patch \
file://0003-Force-host-toolchain-configuration.patch \
+ file://0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \
"
SRC_URI_append_libc-musl = "\
- file://0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
- file://0005-musl-link-against-libexecinfo.patch \
+ file://0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
+ file://0006-musl-link-against-libexecinfo.patch \
"
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/65-based