qtbase: Find wayland-scanner correctly

* Remove silent rules for wayland-scanner

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>

2 files changed, 53 insertions, 6 deletions

diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index 49244bef..5907490c 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
-From f5d5c9778031fbb807753c67133ddda35f9a0e30 Mon Sep 17 00:00:00 2001
+From ccf2e79173cfd0fee9f1e603107792dd5aa8e775 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
-Subject: [PATCH 01/11] Add linux-oe-g++ platform
+Subject: [PATCH 01/12] Add linux-oe-g++ platform
 
 * This qmake.conf unlike other platforms reads most variables from
   shell environment, because it's easier for qt recipes to export
@@ -31,12 +31,13 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform
 
 Upstream-Status: Pending
 
+Change-Id: Ia0cc6a6b00ec78442d80ed2a3cf40b604588a0f6
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  configure                            |  54 ++++++++++++++++---
- mkspecs/linux-oe-g++/qmake.conf      |  39 ++++++++++++++
+ mkspecs/linux-oe-g++/qmake.conf      |  40 ++++++++++++++
  mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
- 3 files changed, 186 insertions(+), 7 deletions(-)
+ 3 files changed, 187 insertions(+), 7 deletions(-)
  create mode 100644 mkspecs/linux-oe-g++/qmake.conf
  create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
 
@@ -149,10 +150,10 @@ index 89246c8..0ab8eee 100755
              EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION"
 diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
 new file mode 100644
-index 0000000..42966fe
+index 0000000..ca26b10
 --- /dev/null
 +++ b/mkspecs/linux-oe-g++/qmake.conf
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,40 @@
 +#
 +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
 +#
@@ -166,6 +167,7 @@ index 0000000..42966fe
 +# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
 +QMAKE_AR              = $(OE_QMAKE_AR) cqs
 +QMAKE_STRIP           = $(OE_QMAKE_STRIP)
++QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER)
 +
 +include(../common/gcc-base-unix.conf)
 +
diff --git a/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch
new file mode 100644
index 00000000..9431e79e
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch
@@ -0,0 +1,45 @@
+From 41a352655485234eda87b150154001ce89496505 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sun, 5 May 2013 11:18:34 +0200
+Subject: [PATCH 12/12] wayland-scanner: disable silent rules
+
+* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
+
+Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ mkspecs/features/wayland-scanner.prf | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
+index 90e1e0f..0750849 100644
+--- a/mkspecs/features/wayland-scanner.prf
++++ b/mkspecs/features/wayland-scanner.prf
+@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS
+ wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
+ wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+ 
+-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
++#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
+ QMAKE_EXTRA_COMPILERS += wayland-server-header
+ 
+ wayland-client-header.name = wayland ${QMAKE_FILE_BASE}
+@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS
+ wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
+ wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+ 
+-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
++#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
+ QMAKE_EXTRA_COMPILERS += wayland-client-header
+ 
+ wayland-code.name = wayland ${QMAKE_FILE_BASE}
+@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES
+ wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
+ wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+ 
+-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
++#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
+ QMAKE_EXTRA_COMPILERS += wayland-code
+-- 
+1.8.2.1
+