summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bb
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-07-04 10:20:19 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-08-08 06:27:24 +0000
commit44538bd408cc7d82b858146b759024f5e38e64cc (patch)
tree380aeaab5e6f246501496f40fa2d1573bff80e85 /recipes-qt/qt5/qtwebengine_git.bb
parent94d666a06730b93f16a4bd9ad8d5509d974e146c (diff)
downloadmeta-qt5-44538bd408cc7d82b858146b759024f5e38e64cc.tar.gz
Upgrade to Qt 5.12.0
Change-Id: I83beaa146a88bf6138e11c87a3308db38d9afd34 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index b772f1b6..3dd5df19 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -3,7 +3,6 @@ SUMMARY = "QtWebEngine combines the power of Chromium and Qt"
3# Read http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ 3# Read http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
4LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \
7 file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ 6 file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
8 file://LICENSE.LGPL3;md5=8211fde12cc8a4e2477602f5953f5b71 \ 7 file://LICENSE.LGPL3;md5=8211fde12cc8a4e2477602f5953f5b71 \
9 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
@@ -26,6 +25,7 @@ DEPENDS += " \
26 libcap \ 25 libcap \
27 gperf-native \ 26 gperf-native \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ 27 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \
29" 29"
30 30
31DEPENDS_append_libc-musl = " libexecinfo" 31DEPENDS_append_libc-musl = " libexecinfo"
@@ -125,7 +125,7 @@ RDEPENDS_${PN}-examples += " \
125 qtdeclarative-qmlplugins \ 125 qtdeclarative-qmlplugins \
126" 126"
127 127
128QT_MODULE_BRANCH_CHROMIUM = "65-based" 128QT_MODULE_BRANCH_CHROMIUM = "67-based"
129 129
130# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11 130# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11
131# 5.11.meta-qt5.6 131# 5.11.meta-qt5.6
@@ -164,8 +164,8 @@ SRC_URI_append_libc-musl = "\
164 file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 164 file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
165" 165"
166 166
167SRCREV_qtwebengine = "d603b705539e1ec0d93761707d7df6d07bced98a" 167SRCREV_qtwebengine = "a5bdc6236ad52586579a9a3da6a059835ed60761"
168SRCREV_chromium = "c020786f57b8f5f3a450a8b77f850afe7c0d3f25" 168SRCREV_chromium = "d4ae420c54b0e8b4660b5c41ec0c38049115f9a9"
169SRCREV = "${SRCREV_qtwebengine}" 169SRCREV = "${SRCREV_qtwebengine}"
170 170
171SRCREV_FORMAT = "qtwebengine_chromium" 171SRCREV_FORMAT = "qtwebengine_chromium"