diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-08-16 12:10:28 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2019-08-19 11:19:11 +0200 |
| commit | 12e0f9c10de85ef47c4fcc64dae627d8e2c71976 (patch) | |
| tree | 1247cdf5b635a0c82a1fe43b290f7e097cd981d0 /tests | |
| parent | 44a713fddedbdda1fa3a815548cf39f5283cdd08 (diff) | |
| parent | d1ff96e328a9bcfffc4196956387935fb79e291e (diff) | |
Merge "Merge remote-tracking branch 'qt/5.13' into dev"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 4ae3b4f65..d81339e86 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,11 +1,10 @@ TEMPLATE=subdirs QT_FOR_CONFIG += waylandclient-private -qtConfig(wayland-client): \ - SUBDIRS += client +!qtHaveModule(waylandcompositor): \ + return() -qtConfig(wayland-client):qtHaveModule(waylandcompositor): \ - SUBDIRS += cmake +SUBDIRS += compositor -qtHaveModule(waylandcompositor): \ - SUBDIRS += compositor +qtConfig(wayland-client): \ + SUBDIRS += client cmake |