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-5.1.1/0022-configure-make-alsa-a-configurable-option.patch | |
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-5.1.1/0022-configure-make-alsa-a-configurable-option.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch deleted file mode 100644 index c01f635b..00000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From e6430c64e4dcc48ae59e48fa303bbea33b253011 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Fri, 19 Jul 2013 23:21:28 +0200 | ||
4 | Subject: [PATCH 19/22] configure: make alsa a configurable option | ||
5 | |||
6 | Allows disabling alsa support at configure time. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | configure | 7 +++++++ | ||
13 | 1 file changed, 7 insertions(+) | ||
14 | |||
15 | diff --git a/configure b/configure | ||
16 | index 896e012..3470b32 100755 | ||
17 | --- a/configure | ||
18 | +++ b/configure | ||
19 | @@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do | ||
20 | UNKNOWN_OPT=yes | ||
21 | fi | ||
22 | ;; | ||
23 | + alsa) | ||
24 | + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | ||
25 | + CFG_ALSA="$VAL" | ||
26 | + else | ||
27 | + UNKNOWN_OPT=yes | ||
28 | + fi | ||
29 | + ;; | ||
30 | gtkstyle) | ||
31 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | ||
32 | CFG_QGTKSTYLE="$VAL" | ||
33 | -- | ||
34 | 1.8.3.1 | ||
35 | |||