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/qt3d_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/qt3d_git.bb')
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 4a816c96..7ca9bf85 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -1,16 +1,14 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | # last tag before this SRCREV is 5.0.0-beta1 | ||
5 | PV = "4.999+5.0.0-beta1+git${SRCPV}" | ||
6 | |||
7 | QT_MODULE_BRANCH = "master" | 4 | QT_MODULE_BRANCH = "master" |
8 | 5 | ||
9 | SRCREV = "d517d39d5491bc95b1dddc3ff5cb880bd3bd0058" | 6 | # last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already |
7 | SRCREV = "4820a197cebd5184ab39ef405eb78f6e69ffc5f9" | ||
10 | 8 | ||
11 | do_configure_prepend() { | 9 | do_configure_prepend() { |
12 | # Temporary hack to get qt3d build for Qt 5.1.0 | 10 | # Temporary hack to get qt3d build for Qt 5.1.0 |
13 | if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then | 11 | if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then |
14 | echo "MODULE_VERSION = 5.1.0" >> ${S}/.qmake.conf | 12 | echo "MODULE_VERSION = 5.3.0" >> ${S}/.qmake.conf |
15 | fi | 13 | fi |
16 | } | 14 | } |