diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-03 10:11:46 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-03 10:11:46 +0300 |
commit | 2746cdba75f411541d80ddfd5cadad2753fe29d3 (patch) | |
tree | 71b5e49cd3dbe1179a2ff866ee6b7cc0e7fbbd92 /recipes-qt/qt5/qt5-git.inc | |
parent | 6bd7ab491793d92f0942d9d8726873a514302849 (diff) | |
parent | 27617dde3560e2fe97989670725eb19747a0f48d (diff) | |
download | meta-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.inc | 3 |
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 | ||
4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
5 | QT_MODULE_BRANCH ?= "5.7" | 5 | QT_MODULE_BRANCH ?= "5.7" |
6 | QT_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 |
8 | SRC_URI = " \ | 9 | SRC_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 | ||
12 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |