diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-07 04:10:06 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-19 11:56:32 +0100 |
| commit | 4b7182a3be2b591e8190ff15b7a121191e4b201f (patch) | |
| tree | c518a426110cae5e5355dc5d02bdcf60a2cf2834 /conf | |
| parent | 79944bda32a7e4799e7e73ea5b0dfc71ff1fc172 (diff) | |
| download | meta-qt5-4b7182a3be2b591e8190ff15b7a121191e4b201f.tar.gz | |
qt5: Upgrade from 5.2.0 to 5.2.1
* qtwayland: Use default LICENSE and LIC_FILES_CHKSUM
* license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a
* qtdeclarative, qtserialport: Update QT_MODULE_BRANCH
* SHA-1 of v5.2.1 tag is only in release branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/qt5-versions.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 3e33af02..b684a6b8 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # Select which version you prefer by defining QT5_VERSION and including this file | 1 | # Select which version you prefer by defining QT5_VERSION and including this file |
| 2 | # possible values now "5.2.0", "5.2.0+git%" | 2 | # possible values now "5.2.1", "5.2.1+git%" |
| 3 | 3 | ||
| 4 | QT5_VERSION ?= "5.2.0" | 4 | QT5_VERSION ?= "5.2.1" |
| 5 | 5 | ||
| 6 | PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" | 6 | PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" |
| 7 | PREFERRED_VERSION_qtbase = "${QT5_VERSION}" | 7 | PREFERRED_VERSION_qtbase = "${QT5_VERSION}" |