aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2016-01-14 09:29:53 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-01-14 11:16:18 +0100
commit3e2058f2e735bbfd15723ce9de27ad8df78a5500 (patch)
treed10de5f6f06397d0c42f8fcf168c12ef254b0646
parentc7cd9cb4661dd1623368d39e66c716f2222d357b (diff)
qt5: allow overriding git protocol used with QT_GIT uri
Add option QT_GIT_PROTOCOL to specify the protocol to be used with the QT_GIT uri. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--conf/layer.conf1
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index f83bd967..b7207e63 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -28,3 +28,4 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
IMAGE_FEATURES[validitems] += "qtcreator-debug"
QT_GIT ?= "git://github.com/qtproject"
+QT_GIT_PROTOCOL ?= "git"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 172a170e..f8fb38b7 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -6,7 +6,7 @@ QT_MODULE_BRANCH ?= "5.6"
# each module needs to define valid SRCREV
SRC_URI = " \
- ${QT_GIT}/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+ ${QT_GIT}/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL} \
"
S = "${WORKDIR}/git"