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/0010-wayland-scanner-disable-silent-rules.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/0010-wayland-scanner-disable-silent-rules.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch deleted file mode 100644 index 749edeee..00000000 --- a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | From 346e27a30ee7e480c5bdb789d12aa41e8e2efad5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sun, 5 May 2013 11:18:34 +0200 | ||
4 | Subject: [PATCH 10/23] wayland-scanner: disable silent rules | ||
5 | |||
6 | * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | mkspecs/features/wayland-scanner.prf | 14 +++++++------- | ||
13 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
14 | |||
15 | diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf | ||
16 | index 2ec064f..847d0f7 100644 | ||
17 | --- a/mkspecs/features/wayland-scanner.prf | ||
18 | +++ b/mkspecs/features/wayland-scanner.prf | ||
19 | @@ -10,7 +10,7 @@ wayland-server-header.input = WAYLANDSERVERSOURCES | ||
20 | wayland-server-header.variable_out = HEADERS | ||
21 | wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} | ||
22 | wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
23 | -silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands | ||
24 | +#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands | ||
25 | QMAKE_EXTRA_COMPILERS += wayland-server-header | ||
26 | |||
27 | wayland-client-header.name = wayland ${QMAKE_FILE_BASE} | ||
28 | @@ -18,7 +18,7 @@ wayland-client-header.input = WAYLANDCLIENTSOURCES | ||
29 | wayland-client-header.variable_out = HEADERS | ||
30 | wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} | ||
31 | wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
32 | -silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands | ||
33 | +#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands | ||
34 | QMAKE_EXTRA_COMPILERS += wayland-client-header | ||
35 | |||
36 | wayland-code.name = wayland ${QMAKE_FILE_BASE} | ||
37 | @@ -26,7 +26,7 @@ wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES | ||
38 | wayland-code.variable_out = SOURCES | ||
39 | wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c | ||
40 | wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
41 | -silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands | ||
42 | +#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands | ||
43 | QMAKE_EXTRA_COMPILERS += wayland-code | ||
44 | |||
45 | qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner) | ||
46 | @@ -37,7 +37,7 @@ qtwayland-client-header.variable_out = HEADERS | ||
47 | qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} | ||
48 | qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} | ||
49 | qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
50 | -silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands | ||
51 | +#silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands | ||
52 | QMAKE_EXTRA_COMPILERS += qtwayland-client-header | ||
53 | |||
54 | qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE} | ||
55 | @@ -46,7 +46,7 @@ qtwayland-client-code.variable_out = SOURCES | ||
56 | qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} | ||
57 | qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp | ||
58 | qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
59 | -silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands | ||
60 | +#silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands | ||
61 | QMAKE_EXTRA_COMPILERS += qtwayland-client-code | ||
62 | |||
63 | qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE} | ||
64 | @@ -55,7 +55,7 @@ qtwayland-server-header.variable_out = HEADERS | ||
65 | qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} | ||
66 | qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} | ||
67 | qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
68 | -silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands | ||
69 | +#silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands | ||
70 | QMAKE_EXTRA_COMPILERS += qtwayland-server-header | ||
71 | |||
72 | qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE} | ||
73 | @@ -64,5 +64,5 @@ qtwayland-server-code.variable_out = SOURCES | ||
74 | qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} | ||
75 | qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp | ||
76 | qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
77 | -silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands | ||
78 | +#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands | ||
79 | QMAKE_EXTRA_COMPILERS += qtwayland-server-code | ||
80 | -- | ||
81 | 1.8.3.2 | ||
82 | |||