summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-01-21 11:56:03 +0100
committerJohan Helsing <johan.helsing@qt.io>2019-01-23 10:45:02 +0000
commitf9ba56f24e7d1fcc9d0dc5eabb55335fc64b9a56 (patch)
tree1b867b43857da66f621de986d2a468b0f60d9d91 /tests
parent8ec451781282d82650167b02acac3d79a51f873a (diff)
Fix platform integration not building with -no-feature-wayland-server
The plugins subdir which includes the platform plugins was not built without the feature wayland-server. Moves the checks inside the plugins folder to make it build. Also disables some tests that won't pass without the compositor API. Fixes: QTBUG-73169 Change-Id: Ie68badd2ff62ee544c31edaff7c732082e0a4115 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 79ad29bd5..4ae3b4f65 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -2,6 +2,10 @@ TEMPLATE=subdirs
QT_FOR_CONFIG += waylandclient-private
qtConfig(wayland-client): \
- SUBDIRS += client cmake
+ SUBDIRS += client
+
+qtConfig(wayland-client):qtHaveModule(waylandcompositor): \
+ SUBDIRS += cmake
+
qtHaveModule(waylandcompositor): \
SUBDIRS += compositor