From 7f97da120b5b3dde22c9d89a8da8a4f35a9f2a26 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 19 Feb 2013 11:16:05 -0800 Subject: [PATCH 1/3] xcbcommon should not be a mandatory dependency Not all platforms that use qtwayland depend on xcbcommon to be present for them to be functional This change won't be needed when this commit from dev branch is merged to stable: commit 894adf8a447865119be7c6c4d01577d8032f4177 Author: Oswald Buddenhagen Date: Mon Apr 8 12:54:58 2013 +0200 make failure to configure wayland non-fatal for a top-level build of qt Signed-off-by: Martin Jansa --- qtwayland.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qtwayland.pro b/qtwayland.pro index 24e104b..66dd38a 100644 --- a/qtwayland.pro +++ b/qtwayland.pro @@ -11,7 +11,7 @@ qtCompileTest(xcomposite) load(qt_parts) !config_wayland { - error(QtWayland requires Wayland 1.0.3 or higher) + error("QtWayland requires Wayland 1.0.3 or higher") } !config_xkbcommon { @@ -19,7 +19,7 @@ load(qt_parts) } !config_wayland_scanner { - error(QtWayland requires wayland-scanner) + error("QtWayland requires wayland-scanner") } !config_wayland_egl { -- 1.8.2.1