diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-19 15:30:56 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-10 12:11:51 +0200 |
| commit | 6374736f37378501793a5191b48545c1fecc0c48 (patch) | |
| tree | 06516ff2623180d41dddbdf91af3d3701c261a8c /recipes-qt/qt5/qtquickcontrols_git.bb | |
| parent | 9957ec5d0176912e189cf7e243617ed9c3cde57a (diff) | |
| download | meta-qt5-6374736f37378501793a5191b48545c1fecc0c48.tar.gz | |
recipes-git: Upgrade from latest origin/release to latest origin/stable
* there wont be 5.2.2 release, so start preparation for 5.3.0
* probably latest 5.3.0-beta1 snapshot was released yesterday, so this
should be reasonably close
* probably wont be merged before creating new release branch for Yocto 1.6
* qtbase: Fix build with X.h included from egl.h
* nativesdk-qt*: Add git recipes
5.2.1 isn't compatible with qtbase-native from git
* qtbase: upgrade to latest stable revision
* 0006-configure-make-pulseaudio-alsa-freetype-a-configurab.patch
was upstreamed in:
0c3301f configure: make pulseaudio and alsa configurable options
* 0005-qt_module-Fix-pkgconfig-replacement.patch
is hopefully resolved in:
eaefbe3 snuff -L/-I with system paths when installing meta files
a33afed de-duplicate setup of libdir replacement in prl files
aa20e7f reshuffle code for clarity
ee86ce8 don't attempt to replace include paths in meta files
but this needs to be double checked
* recipes-git: Upgrade to latest origin/stable
* qt5-git.inc: update LICENSE.LGPL checksum
* only year was updated:
- The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
* qtbase: add 2 patches to fix build issues
* LIC_FILES_CHKSUM: update other git recipes
* qtlocation: bump SRCREV and add to qt5-versions
* qt5-versions.inc: Add line for qttools and fix it for nativesdk-qttools
* qtquick1: fix LIC_FILES_CHKSUM
* qttools: update LIC_FILES_CHKSUM and patches
* new qtdiag needs to be disabled as well because it depends on gui which isn't enabled
in qtbase-native, disable qtpaths as well
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtquickcontrols_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtquickcontrols_git.bb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 69c3353b..fd525f14 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
| @@ -1,6 +1,10 @@ | |||
| 1 | require qt5-git.inc | 1 | require qt5-git.inc |
| 2 | require ${PN}.inc | 2 | require ${PN}.inc |
| 3 | 3 | ||
| 4 | QT_MODULE_BRANCH = "release" | 4 | SRCREV = "ea9add905768a26ce86ab542615a193296642732" |
| 5 | # v5.2.1 + 15 commits | 5 | |
| 6 | SRCREV = "1c54d411ad6e98c3779a412750aec8b93d587872" | 6 | # older copyright year than what e.g. qtbase is using now |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
| 8 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
| 9 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
| 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
