summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb13
1 files changed, 9 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 48d0cb2a..c36e345d 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -107,6 +107,8 @@ RDEPENDS_${PN}-examples += " \
107 107
108QT_MODULE_BRANCH_CHROMIUM = "49-based" 108QT_MODULE_BRANCH_CHROMIUM = "49-based"
109 109
110# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.6
111# 5.6.meta-qt5.1
110SRC_URI += " \ 112SRC_URI += " \
111 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ 113 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
112 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ 114 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
@@ -114,13 +116,16 @@ SRC_URI += " \
114 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ 116 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
115 file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ 117 file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
116 file://0005-Include-dependency-to-QCoreApplication-translate.patch \ 118 file://0005-Include-dependency-to-QCoreApplication-translate.patch \
117 file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ 119"
118 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 120
121# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/49-based
122# 49-based.meta-qt5.1
123SRC_URI += " \
124 file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch;patchdir=src/3rdparty \
125 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patchh;patchdir=src/3rdparty \
119" 126"
120 127
121SRCREV_qtwebengine = "fad625e0ba39e855817bbf206ab9a846d07aeeec" 128SRCREV_qtwebengine = "fad625e0ba39e855817bbf206ab9a846d07aeeec"
122# This is in git submodule, but we're using latest in 45-based
123# SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3"
124SRCREV_chromium = "cb094c05c5f06489fa64412e7f5d9e194a3f9495" 129SRCREV_chromium = "cb094c05c5f06489fa64412e7f5d9e194a3f9495"
125SRCREV = "${SRCREV_qtwebengine}" 130SRCREV = "${SRCREV_qtwebengine}"
126 131