summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt5-git.inc
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-06-03 10:11:46 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-06-03 10:11:46 +0300
commit2746cdba75f411541d80ddfd5cadad2753fe29d3 (patch)
tree71b5e49cd3dbe1179a2ff866ee6b7cc0e7fbbd92 /recipes-qt/qt5/qt5-git.inc
parent6bd7ab491793d92f0942d9d8726873a514302849 (diff)
parent27617dde3560e2fe97989670725eb19747a0f48d (diff)
downloadmeta-qt5-2746cdba75f411541d80ddfd5cadad2753fe29d3.tar.gz
Merge remote-tracking branch 'meta-qt5/master' into 5.7
* meta-qt5/master: qtchooser: add new recipe qtvirtualkeyboard: add recipe qtdeclarative-render2d: add recipe qtdatavis3d: add recipe qtcharts: add recipe licenses: update technology preview license to match upstream cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKE qtbase: add patch to make Qt5Config modules behave better with cmake builds qt5: Allow disabling SHA validation for branch qtbase: Reorder EGL libraries from pkgconfig and defaults: Change-Id: If0804ddb8c506e6f0d1ec32251cca6620dd97abe
Diffstat (limited to 'recipes-qt/qt5/qt5-git.inc')
-rw-r--r--recipes-qt/qt5/qt5-git.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 0bafab51..e1e25ba7 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -3,10 +3,11 @@
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.7" 5QT_MODULE_BRANCH ?= "5.7"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
6 7
7# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
8SRC_URI = " \ 9SRC_URI = " \
9 ${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL} \ 10 ${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL} \
10" 11"
11 12
12S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"