diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2015-03-13 12:59:48 -0700 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-07-24 13:42:14 -0300 |
| commit | 6ecc53200f2903892dbd36073e8b1d76d220c2e8 (patch) | |
| tree | c0f774e5345182199dd0ad99701ee77d81cecaca /meta-qt5 | |
| parent | 2bd0d2a18208b2fe87ce598b5198efa96eab44a4 (diff) | |
| download | tizen-distro-6ecc53200f2903892dbd36073e8b1d76d220c2e8.tar.gz tizen-distro-6ecc53200f2903892dbd36073e8b1d76d220c2e8.tar.bz2 tizen-distro-6ecc53200f2903892dbd36073e8b1d76d220c2e8.zip | |
qt5: add QT_GIT to define git repo for Qt core components
Replace duplicated git URIs with a single definition in layer.conf.
(From meta-qt5 rev: 87235825459d376bf4537c9523eb2496e15893aa)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'meta-qt5')
| -rw-r--r-- | meta-qt5/conf/layer.conf | 2 | ||||
| -rw-r--r-- | meta-qt5/recipes-qt/examples/qt5everywheredemo_1.0.bb | 2 | ||||
| -rw-r--r-- | meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
| -rw-r--r-- | meta-qt5/recipes-qt/qt5/qt5-git.inc | 2 | ||||
| -rw-r--r-- | meta-qt5/recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
| -rw-r--r-- | meta-qt5/recipes-qt/qt5/qtbase_git.bb | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/meta-qt5/conf/layer.conf b/meta-qt5/conf/layer.conf index aacfd7843d..92558b3343 100644 --- a/meta-qt5/conf/layer.conf +++ b/meta-qt5/conf/layer.conf @@ -26,3 +26,5 @@ BBFILE_PRIORITY_qt5-layer = "7" LICENSE_PATH += "${LAYERDIR}/licenses" IMAGE_FEATURES[validitems] += "qtcreator-debug" + +QT_GIT ?= "git://code.qt.io" diff --git a/meta-qt5/recipes-qt/examples/qt5everywheredemo_1.0.bb b/meta-qt5/recipes-qt/examples/qt5everywheredemo_1.0.bb index db5bbe6a70..0546b00cf3 100644 --- a/meta-qt5/recipes-qt/examples/qt5everywheredemo_1.0.bb +++ b/meta-qt5/recipes-qt/examples/qt5everywheredemo_1.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=1187cb795a0f96bce64e63dd1a67dc2b" DEPENDS = "qtdeclarative qtgraphicaleffects" SRCREV = "c17fe9e0ec0882ac4c4dc1168095f569acab5d09" -SRC_URI = "git://code.qt.io/qt-labs/qt5-everywhere-demo.git" +SRC_URI = "${QT_GIT}/qt-labs/qt5-everywhere-demo.git" S = "${WORKDIR}/git/QtDemo" diff --git a/meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb b/meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb index df80407ee9..9832eee43a 100644 --- a/meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -5,7 +5,7 @@ require ${PN}.inc FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" SRC_URI = "\ - git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ + ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ " # common for qtbase-native, qtbase-nativesdk and qtbase diff --git a/meta-qt5/recipes-qt/qt5/qt5-git.inc b/meta-qt5/recipes-qt/qt5/qt5-git.inc index 84ddf49693..c87899807d 100644 --- a/meta-qt5/recipes-qt/qt5/qt5-git.inc +++ b/meta-qt5/recipes-qt/qt5/qt5-git.inc @@ -5,7 +5,7 @@ QT_MODULE_BRANCH ?= "5.4" # each module needs to define valid SRCREV SRC_URI += " \ - git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ + ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ " S = "${WORKDIR}/git" diff --git a/meta-qt5/recipes-qt/qt5/qtbase-native_git.bb b/meta-qt5/recipes-qt/qt5/qtbase-native_git.bb index 5a308d4b9e..e558ee6d53 100644 --- a/meta-qt5/recipes-qt/qt5/qtbase-native_git.bb +++ b/meta-qt5/recipes-qt/qt5/qtbase-native_git.bb @@ -2,7 +2,7 @@ require qt5-git.inc require ${PN}.inc SRC_URI = "\ - git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ + ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ " # common for qtbase-native, qtbase-nativesdk and qtbase diff --git a/meta-qt5/recipes-qt/qt5/qtbase_git.bb b/meta-qt5/recipes-qt/qt5/qtbase_git.bb index 549c92af4e..1be31ea570 100644 --- a/meta-qt5/recipes-qt/qt5/qtbase_git.bb +++ b/meta-qt5/recipes-qt/qt5/qtbase_git.bb @@ -2,7 +2,7 @@ require qt5-git.inc require ${PN}.inc SRC_URI = "\ - git://code.qt.io/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ + ${QT_GIT}/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ " # common for qtbase-native, qtbase-nativesdk and qtbase |