diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-11-02 19:06:14 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-12 15:01:37 +0100 |
commit | c908fe4ebd5a04813be0b83c173fae182bb22728 (patch) | |
tree | ac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5/qtbase_git.bb | |
parent | 775d77e482f1ea203c78003cccd2547075fd720f (diff) | |
download | meta-qt5-c908fe4ebd5a04813be0b83c173fae182bb22728.tar.gz |
qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch
resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5
* drop 0020-Use-BGRA-extension-in-bindTexture.patch
resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c
* drop 0008-wayland-scanner-disable-silent-rules.patch
resolved upstream in:
commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c
Author: Jan Arne Petersen <jan.petersen@kdab.com>
Date: Fri Jul 19 14:35:19 2013 +0200
Fix wayland-scanner to work with CONFIG+=silent
* squash to match more with structure of
https://github.com/meta-qt5/qtbase/tree/stable
* qtmodules: bump SRCREVs for 5.2.0 tags
now all modules using qt5-git should be newer than any 5.1.* version
* qtbase: fix paths in packageconfig *.pc files
include- and lib-paths contained build-sysroot paths
* qtwebkit: Explicitly add ICU libraries to LIBS
fails to build without this
* qtjsbackend: remove for git versions
Found in [1]:
Qt Qml is now using its own built-in Javascript engine and does not depend on
V8 anymore. As such the QtJSBackend shared library has disappeared.
[1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/
* qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes
qtjsbackend is now completely gone
it allows to share more .patch files and configuration in .inc again
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 30d5b237..bd8a6f69 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -1,6 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRC_URI += "file://0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch" | 4 | SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d" |
5 | |||
6 | SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a" | ||