summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bb
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-03-28 13:43:54 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2017-03-29 04:49:46 +0000
commit2c08094d7553c087b8a16955a8da8a9f7b3cdc66 (patch)
treee07cd954eb2875edb8e0316cbdbeee5aad3ff968 /recipes-qt/qt5/qtwebengine_git.bb
parentf108145d26bc9a5d9b3164137117df8b84f65a98 (diff)
downloadmeta-qt5-2c08094d7553c087b8a16955a8da8a9f7b3cdc66.tar.gz
qtwebengine: update to latest version
Includes fix for Intel NUC build, where target and host have the same architecture. Remove no longer required patches. Last chromium patch left in place as it might still be required. Task-number: QTBUG-59768 Change-Id: I2c598926e56c07224fffb43af98834d225b10bad Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> 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.bb13
1 files changed, 4 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 13777517..133bd0f0 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -101,21 +101,16 @@ RDEPENDS_${PN}-examples += " \
101 qtdeclarative-qmlplugins \ 101 qtdeclarative-qmlplugins \
102" 102"
103 103
104QT_MODULE_BRANCH_CHROMIUM = "55-based" 104QT_MODULE_BRANCH_CHROMIUM = "56-based"
105 105
106SRC_URI += " \ 106SRC_URI += " \
107 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 107 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
108 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
109 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
110 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
111 file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
112 file://0005-Include-dependency-to-QCoreApplication-translate.patch \
113 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
114 file://0001-Force-host-toolchain-configuration.patch \ 108 file://0001-Force-host-toolchain-configuration.patch \
109 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
115" 110"
116 111
117SRCREV_qtwebengine = "29afdb0a34e425728ccf85b8421e9b1aadb22f45" 112SRCREV_qtwebengine = "140d12802c9ebc54f5816fbf1a410c5bdc730ec6"
118SRCREV_chromium = "049134677a607781ab9508e7b769b2055d714543" 113SRCREV_chromium = "8d882ead843178d1ba30f0d80d722e147788e6d1"
119SRCREV = "${SRCREV_qtwebengine}" 114SRCREV = "${SRCREV_qtwebengine}"
120 115
121SRCREV_FORMAT = "qtwebengine_chromium" 116SRCREV_FORMAT = "qtwebengine_chromium"