aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-03-02 12:45:24 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2018-04-12 18:43:47 +0000
commit4e7ba65ba6ad4f88683701428aba037f2091fafc (patch)
tree514bbda74417c04cf53b13311a5bfedc5a9ed1f6
parentbf68f8b8f5a31c9814a09f6c4e145dda7cdd8634 (diff)
Change default SRC_URI from github.com to code.qt.io
There have been issues in the past with github qt mirror being out of sync with code.qt.io for certain module repos. Right now there's been a several days long break in update cycle for seemingly all the qt modules where content has not been pushed to the github mirror. Change the default SRC_URI to the more reliable code.qt.io. Change-Id: Ic7d3b9a82ef0ae502e99a8516ef78ca09250fd1e Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--conf/layer.conf4
-rw-r--r--recipes-qt/examples/qt5everywheredemo_1.0.bb3
2 files changed, 4 insertions, 3 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 9c587b1b..7687759c 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -35,6 +35,6 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
IMAGE_FEATURES[validitems] += "qtcreator-debug"
-QT_GIT ?= "git://github.com/qt"
-QT_LABS_GIT ?= "git://github.com/qt-labs"
+QT_GIT_PROJECT ?= "qt"
+QT_GIT ?= "git://code.qt.io/${QT_GIT_PROJECT}"
QT_GIT_PROTOCOL ?= "git"
diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb
index ee947991..493344f7 100644
--- a/recipes-qt/examples/qt5everywheredemo_1.0.bb
+++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://qml/QtDemo/main.qml;endline=39;md5=7d80863906a4bc8ffc
DEPENDS = "qtdeclarative qtgraphicaleffects qtsvg qtmultimedia"
SRCREV = "35d72a2eba7456a2efc5eb8b77afbc00f69ba0ac"
-SRC_URI = "${QT_LABS_GIT}/qt-labs-qt5-everywhere-demo"
+QT_GIT_PROJECT = "qt-labs"
+SRC_URI = "${QT_GIT}/qt5-everywhere-demo"
S = "${WORKDIR}/git/QtDemo"