diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-16 13:15:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-18 12:07:34 +0200 |
commit | 18741e483851e1a6aae79992b130aee34ad48879 (patch) | |
tree | c6523af371af79a48d726578217d6b3b1570beb0 /recipes-qt/qt5/qt5-git.inc | |
parent | d2c05c81e8230358dca80cf9df67e49f9f672a29 (diff) | |
download | meta-qt5-18741e483851e1a6aae79992b130aee34ad48879.tar.gz |
recipes-git: upgrade to 5.5
* based on my WIP patch + fixes from John Mullen
* I was trying to get rhid of 0003-Add-external-hostbindir-option.patch
and 0010-Add-external-hostbindir-option-for-native-sdk.patch by using
upstream configure parameter added in some previous version, but I've
failed, so now good-old -external-hostbindir parameter is back
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 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index b0571bf0..ea37b55c 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | # Copyright (C) 2012 O.S. Systems Software LTDA. | 1 | # Copyright (C) 2012 O.S. Systems Software LTDA. |
2 | # Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com> |
3 | 3 | ||
4 | QT_MODULE_BRANCH ?= "5.4" | 4 | QT_MODULE_BRANCH ?= "5.5" |
5 | 5 | ||
6 | # each module needs to define valid SRCREV | 6 | # each module needs to define valid SRCREV |
7 | SRC_URI = " \ | 7 | SRC_URI = " \ |
@@ -10,4 +10,10 @@ SRC_URI = " \ | |||
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | PV = "5.4.2+git${SRCPV}" | 13 | PV = "5.5.0+git${SRCPV}" |
14 | |||
15 | #LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | ||
16 | #LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ | ||
17 | # file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ | ||
18 | # file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
19 | # file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||