summaryrefslogtreecommitdiffstats
path: root/qtwayland.pro
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-04-08 12:54:58 +0200
committerJørgen Lind <jorgen.lind@digia.com>2013-04-08 13:20:21 +0200
commit894adf8a447865119be7c6c4d01577d8032f4177 (patch)
tree062d2778963644dc51ccc8fdd2f2d7119187e63a /qtwayland.pro
parentaf7f34666e501c88e354341d94f1b663c0489673 (diff)
make failure to configure wayland non-fatal for a top-level build of qt
Change-Id: Ibd0557158ffa00cbacd64b4780961a684ab40afb Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'qtwayland.pro')
-rw-r--r--qtwayland.pro9
1 files 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 {