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/0004-qt_functions-temporary-remove-isEmpty-check.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/0004-qt_functions-temporary-remove-isEmpty-check.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch deleted file mode 100644 index 955d791c..00000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 21c573762a168f874f32c8bf49f75442e608e08a Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 17 Apr 2013 18:06:25 +0200 | ||
4 | Subject: [PATCH 04/22] qt_functions: temporary remove isEmpty check | ||
5 | |||
6 | * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value | ||
7 | * isEmpty works correctly only with qmake variables (e.g. $$FOO - | ||
8 | isEmpty(FOO)), but doesn't work with system properties like $$[FOO]. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | --- | ||
14 | mkspecs/features/qt_functions.prf | 6 +++++- | ||
15 | mkspecs/features/qt_tool.prf | 3 +-- | ||
16 | 2 files changed, 6 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | ||
19 | index 4e12d3d..e20ad9d 100644 | ||
20 | --- a/mkspecs/features/qt_functions.prf | ||
21 | +++ b/mkspecs/features/qt_functions.prf | ||
22 | @@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { | ||
23 | $$1 = $$eval(QT_TOOL.$${2}.binary) | ||
24 | isEmpty($$1) { | ||
25 | $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 | ||
26 | - isEmpty($$[QT_EXTERNAL_HOST_BINS]) { | ||
27 | + # for some reason isEmpty does not work here, FIXME before submitting upstream | ||
28 | + # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) | ||
29 | + # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true | ||
30 | + # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch | ||
31 | + !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { | ||
32 | $$1 = $$[QT_HOST_BINS]/$$2 | ||
33 | } | ||
34 | exists($$eval($$1).pl) { | ||
35 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf | ||
36 | index 83ef3a0..21c9eb7 100644 | ||
37 | --- a/mkspecs/features/qt_tool.prf | ||
38 | +++ b/mkspecs/features/qt_tool.prf | ||
39 | @@ -15,8 +15,7 @@ CONFIG += console | ||
40 | |||
41 | # If we are doing a prefix build, create a "module" pri which enables | ||
42 | # qtPrepareTool() to work with the non-installed build. | ||
43 | -# Non-bootstrapped tools always need this because of the environment setup. | ||
44 | -!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { | ||
45 | +!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { | ||
46 | isEmpty(MODULE):MODULE = $$TARGET | ||
47 | |||
48 | !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) | ||
49 | -- | ||
50 | 1.8.3.1 | ||
51 | |||