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

(From meta-qt5 rev: 01f1ab8ee8ca31b39d097a913f9f6f8de89f5fb5)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-qt5/recipes-qt/qt5/qtwebengine_5.3.2+git.bb b/meta-qt5/recipes-qt/qt5/qtwebengine_5.3.2+git.bb
index c9a6ea4..9c65d7a 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtwebengine_5.3.2+git.bb
+++ b/meta-qt5/recipes-qt/qt5/qtwebengine_5.3.2+git.bb
@@ -9,12 +9,8 @@ DEFAULT_PREFERENCE = "1"
 QT_MODULE_BRANCH = "1.0"
 QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based"
 
-# For now we have to define SRC_URI here again as qt5-git.inc points to
-# qt.gitorious.org/qt/ but qtwebengine is still on qt.gitorious.org/qt-labs/ which will
-# switch soon.
-SRC_URI = " \
-    git://gitorious.org/qt/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \
-    git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
+SRC_URI += " \
+    git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
     file://0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch \
     file://0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
     file://0003-functions.prf-Try-to-add-_moc-suffix.patch \
@@ -24,5 +20,6 @@ SRC_URI = " \
 "
 SRCREV_qtwebengine = "21f6ce84ecca9a4ff2aa980b21d2e5174c78d14b"
 SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff"
+SRCREV = "${SRCREV_qtwebengine}"
 
 SRCREV_FORMAT = "qtwebengine"

diff --git a/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb b/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb
index 7fe2190..a2f685a 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb
+++ b/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb
@@ -4,12 +4,8 @@ require ${PN}.inc
 QT_MODULE_BRANCH = "1.0"
 QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based"
 
-# For now we have to define SRC_URI here again as qt5-git.inc points to
-# qt.gitorious.org/qt/ but qtwebengine is still on qt.gitorious.org/qt-labs/ which will
-# switch soon.
-SRC_URI = " \
-    git://gitorious.org/qt/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \
-    git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
+SRC_URI += " \
+    git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
     file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
     file://0002-functions.prf-Try-to-add-_moc-suffix.patch \
     file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \
@@ -18,5 +14,6 @@ SRC_URI = " \
 "
 SRCREV_qtwebengine = "14fcf0d3193e2ee2bf904a305c9f34ff8d0e5ce7"
 SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff"
+SRCREV = "${SRCREV_qtwebengine}"
 
 SRCREV_FORMAT = "qtwebengine"