diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-11 16:42:32 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:34:49 +0000 |
commit | 3e7da25564d74195610adede9391ca733a0a1412 (patch) | |
tree | 6cc77f6d18df75d2c86191aea62e7336f24a1dbc /recipes-qt/qt5/qt5-git.inc | |
parent | cd0da4e4836cc1f35ad522b34ed254a83b270167 (diff) | |
download | meta-qt5-3e7da25564d74195610adede9391ca733a0a1412.tar.gz |
qt5: update to Qt 5.11.2
Update The-Qt-Company-Commercial license to the actual commercial
license which also replaces preview license in qtbase. Remove old
licenses that are no longer used in any module.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qt5-git.inc')
-rw-r--r-- | recipes-qt/qt5/qt5-git.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 09b6cc56..7128301c 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
5 | QT_MODULE_BRANCH ?= "5.11" | 5 | QT_MODULE_BRANCH ?= "5.11" |
6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" | 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" |
7 | 7 | ||
8 | # each module needs to define valid SRCREV | 8 | # each module needs to define valid SRCREV |
9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" | |||
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
17 | PV = "5.11.1+git${SRCPV}" | 17 | PV = "5.11.2+git${SRCPV}" |