From 894adf8a447865119be7c6c4d01577d8032f4177 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 8 Apr 2013 12:54:58 +0200 Subject: make failure to configure wayland non-fatal for a top-level build of qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ibd0557158ffa00cbacd64b4780961a684ab40afb Reviewed-by: Jørgen Lind --- qtwayland.pro | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qtwayland.pro b/qtwayland.pro index 3d5a6b07..2886cff2 100644 --- a/qtwayland.pro +++ b/qtwayland.pro @@ -11,15 +11,18 @@ qtCompileTest(xcomposite) load(qt_parts) !config_wayland { - error(QtWayland requires Wayland 1.0.3 or higher) + warning("QtWayland requires Wayland 1.0.3 or higher") + SUBDIRS = } !config_xkbcommon { - error(QtWayland requires xkbcommon 0.2.0 or higher) + warning("QtWayland requires xkbcommon 0.2.0 or higher") + SUBDIRS = } !config_wayland_scanner { - error(QtWayland requires wayland-scanner) + warning("QtWayland requires wayland-scanner") + SUBDIRS = } !config_wayland_egl { -- cgit v1.2.1