aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-02-27 15:08:45 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2018-03-02 13:19:14 +0000
commitaea4f1aec4e87276cf6985807fb0487393de154c (patch)
tree6ce0d22a1e918992ade81b54c9936efb2ae30fbf
parenta96836aedf30d2e26fbcafc13b1313d1325a0730 (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. (cherry-picked from commit f6f12ed5bcf5fc1e36bc5c6dee386947df3c3dc2) Change-Id: I96fcd27148a907860449fe112bdd7e4cad3a9380 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-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 7eb3b2db..a85c2de4 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -33,6 +33,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"