aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwayland
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-09-29 05:37:20 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-10-04 04:23:53 +0200
commitcfe122037d04fb78a8a21f7936e6822170916246 (patch)
tree286e3ec9aba1603aa77edbfde756998ef7798170 /recipes-qt/qt5/qtwayland
parent3700c51c246f6aaf8ef6a3ce098578664873c096 (diff)
qt*: refresh the patches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland')
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch6
-rw-r--r--recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch8
2 files changed, 7 insertions, 7 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
index 1fac95b7..e224e55e 100644
--- 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
@@ -1,4 +1,4 @@
-From 761367755efa529c41ba414521eaed0b10873d99 Mon Sep 17 00:00:00 2001
+From fd79724a05ee7fb52d8ac1b02057e7a1ba4efb14 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
@@ -11,7 +11,7 @@ Signed-off-by: Simon Busch <morphis@gravedo.de>
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro
-index ac2d07b..53b93f9 100644
+index ac2d07b..7a46a24 100644
--- a/src/qtwaylandscanner/qtwaylandscanner.pro
+++ b/src/qtwaylandscanner/qtwaylandscanner.pro
@@ -1,6 +1,10 @@
@@ -28,5 +28,5 @@ index ac2d07b..53b93f9 100644
+target.path = $$[QT_HOST_BINS]
+INSTALLS += target
--
-1.8.1.2
+2.1.1
diff --git a/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch b/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch
index 998f8b67..1b46f9bc 100644
--- a/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch
+++ b/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch
@@ -1,4 +1,4 @@
-From 201b36614907584a0d446975bddbb11a495540ed Mon Sep 17 00:00:00 2001
+From 6e554b116bfe57744a3de02370fd96b9ea13ecb2 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 22 Feb 2014 17:47:44 +0100
Subject: [PATCH] examples.pro: include server-buffer only when building with
@@ -14,10 +14,10 @@ Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/examples/examples.pro b/examples/examples.pro
-index 2d4cd1b..fb2497e 100644
+index d633fb9..643c7cd 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
-@@ -13,5 +13,7 @@ contains(CONFIG, wayland-compositor) {
+@@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) {
SUBDIRS += qml-compositor
}
@@ -27,5 +27,5 @@ index 2d4cd1b..fb2497e 100644
+ }
}
--
-1.8.5.3
+2.1.1