From c524da4747607a770bdef7ed6773bc1c1e48f346 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 29 Sep 2014 19:03:50 +0200 Subject: qtwebengine: update repository location * both were moved from qt-labs to qt and chromium repo was renamed to qtwebengine-chromium Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebengine_git.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index d06c5214..08486df2 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -6,14 +6,15 @@ require ${PN}.inc # the master branch which will lead to 1.0 when Qt 5.4 is released here. PV = "0.9.99+git${SRCPV}" -QT_MODULE_BRANCH = "master" +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-labs/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \ - git://gitorious.org/qt-labs/chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH};destsuffix=git/src/3rdparty \ + 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 \ 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 \ -- cgit v1.2.3