2 files changed, 32 insertions, 30 deletions

diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
new file mode 100644
index 00000000..1fac95b7
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
@@ -0,0 +1,32 @@
+From 761367755efa529c41ba414521eaed0b10873d99 Mon Sep 17 00:00:00 2001
+From: Simon Busch <morphis@gravedo.de>
+Date: Fri, 19 Jul 2013 13:35:14 +0000
+Subject: [PATCH] Install the qtwaylandscanner tool to the native side
+
+Upstream-Status: Inappropiate [configuration]
+
+Signed-off-by: Simon Busch <morphis@gravedo.de>
+---
+ src/qtwaylandscanner/qtwaylandscanner.pro | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro
+index ac2d07b..53b93f9 100644
+--- a/src/qtwaylandscanner/qtwaylandscanner.pro
++++ b/src/qtwaylandscanner/qtwaylandscanner.pro
+@@ -1,6 +1,10 @@
+ option(host_build)
+ 
+-SOURCES += qtwaylandscanner.cpp
++TARGET = qtwaylandscanner$$qtPlatformTargetSuffix()
++CONFIG += console warn_off
++QT = core
+ 
+-load(qt_tool)
++SOURCES += qtwaylandscanner.cpp
+ 
++target.path = $$[QT_HOST_BINS]
++INSTALLS += target
+-- 
+1.8.1.2
+
diff --git a/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch b/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch
deleted file mode 100644
index 6bbbaa1e..00000000
--- a/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b455f5acaec811b70ae3eb896c08a634909cb9d1 Mon Sep 17 00:00:00 2001
-From: Carsten Munk <carsten.munk@jollamobile.com>
-Date: Wed, 17 Jul 2013 07:28:04 +0000
-Subject: [PATCH] Fix Project ERROR: Module v8 has no public API. make[1]: ***
- [sub-qml-compositor-make_first] Error 3
-
-Cherry-picked from:
-https://github.com/kvahlman/qtwayland/commit/b455f5acaec811b70ae3eb896c08a634909cb9d1
-
-Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com>
----
- qtwayland/examples/qml-compositor/qml-compositor.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro
-index 0bc0b02..e397002 100644
---- a/examples/qml-compositor/qml-compositor.pro
-+++ b/examples/qml-compositor/qml-compositor.pro
-@@ -2,7 +2,7 @@ DEFINES += QT_COMPOSITOR_QUICK
- 
- LIBS += -L ../../lib
- 
--QT += quick qml v8
-+QT += quick qml
- QT += quick-private
- 
- QT += compositor
--- 
-1.8.4
-