diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 14:50:03 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-06 12:44:47 +0000 |
commit | 9ed1897bf7520db9fa93e8aa3508994472804569 (patch) | |
tree | 8bca0963b9d120c43b4a793b1cc5f8f3fffb3c35 /recipes-qt/qt5/qt5-git.inc | |
parent | f69baf2a72b224fafad89a1422b692fb95ec439b (diff) | |
download | meta-qt5-9ed1897bf7520db9fa93e8aa3508994472804569.tar.gz |
qt5-git.inc: drop nobranch=1
* sneaked in with:
commit 333949a8239dfa7788b35f1059614733e11a6a25
Author: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu Jan 26 16:54:50 2017 +0200
Upgrade to Qt 5.8
* use 5.10.1 branch by defaut and fix QT_MODULE_BRANCH
in qtknx, qtmqtt, qtwebkit-examples, qtwebkit which don't
have 5.10.1 branch at all
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt5-git.inc')
-rw-r--r-- | recipes-qt/qt5/qt5-git.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 7ee06438..beba9135 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -1,9 +1,9 @@ | |||
1 | # Copyright (C) 2012-2016 O.S. Systems Software LTDA. | 1 | # Copyright (C) 2012-2016 O.S. Systems Software LTDA. |
2 | # Copyright (C) 2013-2017 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> |
3 | 3 | ||
4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
5 | QT_MODULE_BRANCH ?= "5.10" | 5 | QT_MODULE_BRANCH ?= "5.10.1" |
6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" | 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" |
7 | 7 | ||
8 | # each module needs to define valid SRCREV | 8 | # each module needs to define valid SRCREV |
9 | SRC_URI = " \ | 9 | SRC_URI = " \ |