diff options
Diffstat (limited to 'recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch')
-rw-r--r-- | recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch b/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch deleted file mode 100644 index 0571ea5e..00000000 --- a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 7f97da120b5b3dde22c9d89a8da8a4f35a9f2a26 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
3 | Date: Tue, 19 Feb 2013 11:16:05 -0800 | ||
4 | Subject: [PATCH 1/3] xcbcommon should not be a mandatory dependency | ||
5 | |||
6 | Not all platforms that use qtwayland depend on xcbcommon to be present | ||
7 | for them to be functional | ||
8 | |||
9 | This change won't be needed when this commit from dev branch is merged | ||
10 | to stable: | ||
11 | commit 894adf8a447865119be7c6c4d01577d8032f4177 | ||
12 | Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com> | ||
13 | Date: Mon Apr 8 12:54:58 2013 +0200 | ||
14 | |||
15 | make failure to configure wayland non-fatal for a top-level build of qt | ||
16 | |||
17 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
18 | --- | ||
19 | qtwayland.pro | 4 ++-- | ||
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/qtwayland.pro b/qtwayland.pro | ||
23 | index 24e104b..66dd38a 100644 | ||
24 | --- a/qtwayland.pro | ||
25 | +++ b/qtwayland.pro | ||
26 | @@ -11,7 +11,7 @@ qtCompileTest(xcomposite) | ||
27 | load(qt_parts) | ||
28 | |||
29 | !config_wayland { | ||
30 | - error(QtWayland requires Wayland 1.0.3 or higher) | ||
31 | + error("QtWayland requires Wayland 1.0.3 or higher") | ||
32 | } | ||
33 | |||
34 | !config_xkbcommon { | ||
35 | @@ -19,7 +19,7 @@ load(qt_parts) | ||
36 | } | ||
37 | |||
38 | !config_wayland_scanner { | ||
39 | - error(QtWayland requires wayland-scanner) | ||
40 | + error("QtWayland requires wayland-scanner") | ||
41 | } | ||
42 | |||
43 | !config_wayland_egl { | ||
44 | -- | ||
45 | 1.8.2.1 | ||
46 | |||