diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-11-27 13:48:38 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-09 11:06:30 +0100 |
commit | 54c44443c34f077bfc2c5cc3a92d6db59d28343c (patch) | |
tree | 479cd0ba85d55e8d01ae1396bca7397880360b70 /recipes-qt/qt5/qtwebengine_git.bb | |
parent | 5b8f470597d4f163952f3b63a8ee39a2ccabfe4c (diff) | |
download | meta-qt5-54c44443c34f077bfc2c5cc3a92d6db59d28343c.tar.gz |
qt5-git: Update to rc1+, latest revision in 5.4 branch
* qtwebengine LIC_FILES_CHKSUM updated because of Copyright
year update in chromium's LICENSE
< // Copyright (c) 2013 The Chromium Authors. All rights reserved.
and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because
it was including also few #include lines which were changed recently
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 | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index a2f685ae..aac966b1 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -1,19 +1,22 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | QT_MODULE_BRANCH = "1.0" | 4 | LIC_FILES_CHKSUM = " \ |
5 | QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based" | 5 | file://src/core/browser_context_qt.cpp;md5=91895ac1852e1b07202d9716194e8dd8;beginline=1;endline=35 \ |
6 | file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \ | ||
7 | " | ||
8 | |||
9 | QT_MODULE_BRANCH = "5.4" | ||
10 | QT_MODULE_BRANCH_CHROMIUM = "37.0.2062-based" | ||
6 | 11 | ||
7 | SRC_URI += " \ | 12 | SRC_URI += " \ |
8 | git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ | 13 | git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ |
9 | file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ | 14 | file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ |
10 | file://0002-functions.prf-Try-to-add-_moc-suffix.patch \ | 15 | file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ |
11 | file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \ | 16 | file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ |
12 | file://0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch \ | ||
13 | file://0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \ | ||
14 | " | 17 | " |
15 | SRCREV_qtwebengine = "14fcf0d3193e2ee2bf904a305c9f34ff8d0e5ce7" | 18 | SRCREV_qtwebengine = "ff47f09a94a0a31edd40500985ff670e8f35cc2c" |
16 | SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff" | 19 | SRCREV_chromium = "66388297cf2ca42049fb099237134ec33465e2f5" |
17 | SRCREV = "${SRCREV_qtwebengine}" | 20 | SRCREV = "${SRCREV_qtwebengine}" |
18 | 21 | ||
19 | SRCREV_FORMAT = "qtwebengine" | 22 | SRCREV_FORMAT = "qtwebengine" |