diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2014-05-07 19:30:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-09 13:40:18 +0200 |
| commit | 5b740c6246e092bc49b029bb7b12b614c4d0ce1e (patch) | |
| tree | 80825ca5e0283d730865e498b029daf1b8a10ffa /qtwayland.pro | |
| parent | cbc690145af96e32f1b1cbdc42bc6b1e2d4c3bd2 (diff) | |
Error out if dependencies aren't met.
This ensures that a build won't become a no-op with confusing results, and no
clear indication of what the problem is.
Change-Id: Ie9ad14b8d8230cfd3b2772511b853d71f2eed977
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'qtwayland.pro')
| -rw-r--r-- | qtwayland.pro | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/qtwayland.pro b/qtwayland.pro index a834a48a9..3390ba31f 100644 --- a/qtwayland.pro +++ b/qtwayland.pro @@ -13,25 +13,14 @@ qtCompileTest(libhybris_egl_server) load(qt_parts) -!config_wayland { - warning("QtWayland requires Wayland 1.2.0 or higher") - SUBDIRS = -} +!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_xkbcommon { warning("No xkbcommon 0.2.0 or higher found, disabling support for it") } -!config_wayland_scanner { - warning("QtWayland requires wayland-scanner") - SUBDIRS = -} - -!config_wayland_cursor { - warning("QtWayland requires wayland-cursor") - SUBDIRS = -} - !config_wayland_egl { message("no wayland-egl support detected, cross-toolkit compatibility disabled"); } |