summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-08-15 14:14:23 +0200
committerPaul Olav Tvete <paul.tvete@qt.io>2019-08-19 15:05:22 +0200
commitffec8ce782cebd4432c10ad7fb467b89164b6a2d (patch)
tree9785851d152f2bddb352ff5869a99ed21534f535 /tests
parent12e0f9c10de85ef47c4fcc64dae627d8e2c71976 (diff)
Make it possible to build only the compositor module
Reduces unnecessary coupling between the compositor and client modules. [ChangeLog][Compositor] The compositor module no longer depends on the client module. Change-Id: I108e56960835b6c31c450d5ae08a0a101af9422b Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro11
-rw-r--r--tests/auto/client/inputcontext/inputcontext.pro2
2 files changed, 6 insertions, 7 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index d81339e86..032ae47a4 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,10 +1,11 @@
TEMPLATE=subdirs
QT_FOR_CONFIG += waylandclient-private
-!qtHaveModule(waylandcompositor): \
- return()
+qtHaveModule(waylandclient): \
+ SUBDIRS += client
-SUBDIRS += compositor
+qtHaveModule(waylandclient):qtHaveModule(waylandcompositor): \
+ SUBDIRS += cmake
-qtConfig(wayland-client): \
- SUBDIRS += client cmake
+qtHaveModule(waylandcompositor): \
+ SUBDIRS += compositor
diff --git a/tests/auto/client/inputcontext/inputcontext.pro b/tests/auto/client/inputcontext/inputcontext.pro
index 4419b3e77..1971d455e 100644
--- a/tests/auto/client/inputcontext/inputcontext.pro
+++ b/tests/auto/client/inputcontext/inputcontext.pro
@@ -1,6 +1,4 @@
include (../shared/shared.pri)
-QT += waylandcompositor
-
TARGET = tst_inputcontext
SOURCES += tst_inputcontext.cpp