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/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.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-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch deleted file mode 100644 index 6117e7fb..00000000 --- a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From df07d747bdbb5652165a3c9395247729a4bf2fce Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 8 May 2013 23:54:35 +0200 | ||
4 | Subject: [PATCH 11/23] configure: don't export SYSTEM_VARIABLES to .qmake.vars | ||
5 | |||
6 | * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is | ||
7 | causing issues as we need g++ to be used as linker | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | configure | 15 +-------------- | ||
14 | 1 file changed, 1 insertion(+), 14 deletions(-) | ||
15 | |||
16 | diff --git a/configure b/configure | ||
17 | index 74f9e65..7a9a77c 100755 | ||
18 | --- a/configure | ||
19 | +++ b/configure | ||
20 | @@ -849,20 +849,7 @@ fi'` | ||
21 | done | ||
22 | |||
23 | SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" | ||
24 | -for varname in $SYSTEM_VARIABLES; do | ||
25 | - qmakevarname="${varname}" | ||
26 | - # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS | ||
27 | - if [ "${varname}" = "LDFLAGS" ]; then | ||
28 | - qmakevarname="LFLAGS" | ||
29 | - elif [ "${varname}" = "LD" ]; then | ||
30 | - qmakevarname="LINK" | ||
31 | - fi | ||
32 | - cmd=`echo \ | ||
33 | -'if [ -n "\$'${varname}'" ]; then | ||
34 | - QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" | ||
35 | -fi'` | ||
36 | - eval "$cmd" | ||
37 | -done | ||
38 | + | ||
39 | # Use CC/CXX to run config.tests | ||
40 | mkdir -p "$outpath/config.tests" | ||
41 | rm -f "$outpath/config.tests/.qmake.cache" | ||
42 | -- | ||
43 | 1.8.3.2 | ||
44 | |||