diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-18 13:20:03 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-30 14:15:30 +0100 |
commit | 01f1ab8ee8ca31b39d097a913f9f6f8de89f5fb5 (patch) | |
tree | f2ce23c7dbe7d662fed82e397555f15be43f9755 /recipes-qt/qt5/qtwebengine_git.bb | |
parent | 69e1a82939d9e0f1ee22ccc7fe9bf0aa9d4b6e8a (diff) | |
download | meta-qt5-01f1ab8ee8ca31b39d097a913f9f6f8de89f5fb5.tar.gz |
qtwebengine: simplify SRC_URI
* now when it was moved from qt-labs to qt prefix we can reuse the
SRC_URI from qt5-git.bb
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 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 7fe21900..a2f685ae 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -4,12 +4,8 @@ require ${PN}.inc | |||
4 | QT_MODULE_BRANCH = "1.0" | 4 | QT_MODULE_BRANCH = "1.0" |
5 | QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based" | 5 | QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based" |
6 | 6 | ||
7 | # For now we have to define SRC_URI here again as qt5-git.inc points to | 7 | SRC_URI += " \ |
8 | # qt.gitorious.org/qt/ but qtwebengine is still on qt.gitorious.org/qt-labs/ which will | 8 | git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ |
9 | # switch soon. | ||
10 | SRC_URI = " \ | ||
11 | git://gitorious.org/qt/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \ | ||
12 | git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ | ||
13 | file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ | 9 | file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ |
14 | file://0002-functions.prf-Try-to-add-_moc-suffix.patch \ | 10 | file://0002-functions.prf-Try-to-add-_moc-suffix.patch \ |
15 | file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \ | 11 | file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \ |
@@ -18,5 +14,6 @@ SRC_URI = " \ | |||
18 | " | 14 | " |
19 | SRCREV_qtwebengine = "14fcf0d3193e2ee2bf904a305c9f34ff8d0e5ce7" | 15 | SRCREV_qtwebengine = "14fcf0d3193e2ee2bf904a305c9f34ff8d0e5ce7" |
20 | SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff" | 16 | SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff" |
17 | SRCREV = "${SRCREV_qtwebengine}" | ||
21 | 18 | ||
22 | SRCREV_FORMAT = "qtwebengine" | 19 | SRCREV_FORMAT = "qtwebengine" |