summaryrefslogtreecommitdiffstats
path: root/qtwayland.pro
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-11-03 15:14:47 +0100
committerPaul Olav Tvete <paul.tvete@qt.io>2016-11-23 06:50:34 +0000
commit1d5b44cbb1e834bc8db94d8ec1ac140b8ca9ed37 (patch)
tree12206741f269aef8d45a8f8165919347dd359d0d /qtwayland.pro
parentc445cf7d4e517248013e707a5050f9e0408a2746 (diff)
Move qtwayland over to use the new configuration system
Re-use configuration results from qtbase where possible and move all pkg-config handling over to be done at configuration time. Since waylandclient and waylandcompositor are two independent libs, this required some duplication of features and libraries used by both in the configure.json files. Change-Id: I1f3ec56c85cb780324cc7634a3ad7951125853a0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'qtwayland.pro')
-rw-r--r--qtwayland.pro36
1 files changed, 0 insertions, 36 deletions
diff --git a/qtwayland.pro b/qtwayland.pro
index f71b842d..0401ab02 100644
--- a/qtwayland.pro
+++ b/qtwayland.pro
@@ -1,38 +1,2 @@
requires(linux:!android)
-
-load(configure)
-qtCompileTest(wayland)
-qtCompileTest(xkbcommon)
-qtCompileTest(wayland_cursor)
-qtCompileTest(wayland_scanner)
-qtCompileTest(wayland_egl)
-qtCompileTest(brcm_egl)
-qtCompileTest(glx)
-qtCompileTest(xcomposite)
-qtCompileTest(drm_egl_server)
-qtCompileTest(libhybris_egl_server)
-
load(qt_parts)
-
-!config_wayland {
- warning("QtWayland requires Wayland 1.6.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");
-}