summaryrefslogtreecommitdiffstats
path: root/qtwayland.pro
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@viroteck.net>2014-08-19 11:37:10 +0200
committerRobin Burchell <robin.burchell@viroteck.net>2014-08-19 11:52:10 +0200
commitd044ad56950e0b00244537f5cb0fec9ea1acf7d1 (patch)
tree45ca4e430d9f2ae5b0f91584db56da8583e98495 /qtwayland.pro
parent48e976599ddd8e68e77230e6bcd4f5f45619954c (diff)
Partially revert "Error out if dependencies aren't met."
This breaks building from qt.pro in qt5.git when doing integration for the whole of Qt on CI nodes that don't have wayland installed. This isn't an optimal solution of course, but it's pragmatic. Maybe it can be revisited if/when per-module configures are ever a thing. We reword the warnings to make it clear that QtWayland will not be built under these circumstances. This partially reverts commit 5b740c6246e092bc49b029bb7b12b614c4d0ce1e. Change-Id: I07bd95a3a0349ad37a9025cdf5fd870c348d3799 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'qtwayland.pro')
-rw-r--r--qtwayland.pro17
1 files changed, 14 insertions, 3 deletions
diff --git a/qtwayland.pro b/qtwayland.pro
index 3390ba31..7881a6c7 100644
--- a/qtwayland.pro
+++ b/qtwayland.pro
@@ -13,14 +13,25 @@ qtCompileTest(libhybris_egl_server)
load(qt_parts)
-!config_wayland: error("QtWayland requires Wayland 1.2.0 or higher")
-!config_wayland_scanner: error("QtWayland requires wayland-scanner")
-!config_wayland_cursor: error("QtWayland requires wayland-cursor")
+!config_wayland {
+ warning("QtWayland requires Wayland 1.2.0 or higher, QtWayland will not be built")
+ SUBDIRS =
+}
!config_xkbcommon {
warning("No xkbcommon 0.2.0 or higher found, disabling support for it")
}
+!config_wayland_scanner {
+ warning("QtWayland requires wayland-scanner, QtWayland will not be built")
+ SUBDIRS =
+}
+
+!config_wayland_cursor {
+ warning("QtWayland requires wayland-cursor, QtWayland will not be built")
+ SUBDIRS =
+}
+
!config_wayland_egl {
message("no wayland-egl support detected, cross-toolkit compatibility disabled");
}