diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-21 22:16:06 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-21 22:22:05 +0200 |
commit | 35ccafd9c533c423aa7985ec2ce7f0512283c154 (patch) | |
tree | d640ca4b1904df2a92e61bd7f3e2ef4a47ae2379 /recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch | |
parent | 81b7031859176f24c028c7234d795812bd1a3c95 (diff) | |
download | meta-qt5-35ccafd9c533c423aa7985ec2ce7f0512283c154.tar.gz |
qtbase: refresh patches, drop 2 unused
* drop Change-Ids, add Upstream-Status
* 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was
rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't
used in recipes
* 0004-Disable-mkv8snapshot.patch and
0005-AddSynchoronization-qimagereader.patch are special, because they
are applied only to 5.0.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch new file mode 100644 index 00000000..ff8aaa1d --- /dev/null +++ b/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 668c20fe721aba2057c8e929e5029c423a687360 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/12] 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 | 6 +++--- | ||
13 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf | ||
16 | index 90e1e0f..0750849 100644 | ||
17 | --- a/mkspecs/features/wayland-scanner.prf | ||
18 | +++ b/mkspecs/features/wayland-scanner.prf | ||
19 | @@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS | ||
20 | wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} | ||
21 | wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
22 | |||
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 | @@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS | ||
29 | wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} | ||
30 | wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
31 | |||
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 | @@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES | ||
38 | wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c | ||
39 | wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
40 | |||
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 | 1.8.2.1 | ||
46 | |||