diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-28 11:48:09 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-28 15:25:25 +0200 |
commit | f8b065ea1174dd1fa7d93359f6826bfc9d23174c (patch) | |
tree | 2da2a4be9b5aff64e54a818a19a8939266eed05f /recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch | |
parent | f52b59a5cc9ddfb0ede39194e284c858bfd0cbd8 (diff) | |
download | meta-qt5-f8b065ea1174dd1fa7d93359f6826bfc9d23174c.tar.gz |
qt5: drop 5.0.0 and 5.0.1 versions
* maintaining 4 different versions requires a lot more testing of
changes in .inc files and we have only one version of modules without
release (only one _git.bb) and it's impossible to find SRCREV which
would be compatible with all 4 versions.
* 0005-AddSynchoronization-qimagereader.patch was already backported to
5.0.2 in upstream
* 0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch was
already applied in 5.0.2
* 5.0.2 is now default version (based on DEFAULT_PREFERENCE and in
qt5-versions.inc
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, 0 insertions, 46 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 deleted file mode 100644 index ff8aaa1d..00000000 --- a/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
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 | |||