diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-11-27 13:48:38 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-09 11:06:30 +0100 |
| commit | 54c44443c34f077bfc2c5cc3a92d6db59d28343c (patch) | |
| tree | 479cd0ba85d55e8d01ae1396bca7397880360b70 /conf | |
| parent | 5b8f470597d4f163952f3b63a8ee39a2ccabfe4c (diff) | |
| download | meta-qt5-54c44443c34f077bfc2c5cc3a92d6db59d28343c.tar.gz | |
qt5-git: Update to rc1+, latest revision in 5.4 branch
* qtwebengine LIC_FILES_CHKSUM updated because of Copyright
year update in chromium's LICENSE
< // Copyright (c) 2013 The Chromium Authors. All rights reserved.
and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because
it was including also few #include lines which were changed recently
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/qt5-versions.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 7530a245..3048e153 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc | |||
| @@ -1,5 +1,5 @@ | |||
| 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.3.2", "5.3.0+5.4.0-alpha1+git" | 2 | # possible values now "5.3.2", "5.3.99+5.4.0-rc1+git%" |
| 3 | 3 | ||
| 4 | QT5_VERSION ?= "5.3.2" | 4 | QT5_VERSION ?= "5.3.2" |
| 5 | 5 | ||
| @@ -21,6 +21,7 @@ PREFERRED_VERSION_qtsensors = "${QT5_VERSION}" | |||
| 21 | PREFERRED_VERSION_qtserialport = "${QT5_VERSION}" | 21 | PREFERRED_VERSION_qtserialport = "${QT5_VERSION}" |
| 22 | PREFERRED_VERSION_qtscript = "${QT5_VERSION}" | 22 | PREFERRED_VERSION_qtscript = "${QT5_VERSION}" |
| 23 | PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" | 23 | PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" |
| 24 | PREFERRED_VERSION_qtsystems = "${QT5_VERSION}" | ||
| 24 | PREFERRED_VERSION_qttools = "${QT5_VERSION}" | 25 | PREFERRED_VERSION_qttools = "${QT5_VERSION}" |
| 25 | PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" | 26 | PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" |
| 26 | PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}" | 27 | PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}" |
