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-16 12:10:28 +0200 |
| commit | d1ff96e328a9bcfffc4196956387935fb79e291e (patch) | |
| tree | 6aa1fefb13f679305dd535f3b3786ebf6f6585a7 /tests | |
| parent | ed79c14c48501cb9d2ed922da78843f06ba208f0 (diff) | |
| parent | fc9c4a04d7359cb00a733c56cf85fc9737c9886d (diff) | |
Merge remote-tracking branch 'qt/5.13' into dev
Change-Id: Ief5f30fc1dbd0e6531b19e723057b06e9bd419b4
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 |