diff options
| -rw-r--r-- | examples/wayland/wayland.pro | 8 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro index b9e4263e7..5551b5703 100644 --- a/examples/wayland/wayland.pro +++ b/examples/wayland/wayland.pro @@ -1,7 +1,11 @@ -requires(qtHaveModule(waylandcompositor)) -requires(qtConfig(opengl)) TEMPLATE=subdirs +!qtHaveModule(waylandcompositor): \ + return() + +!qtConfig(opengl): \ + return() + SUBDIRS += \ qwindow-compositor \ minimal-cpp diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 79ad29bd5..d81339e86 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,7 +1,10 @@ TEMPLATE=subdirs QT_FOR_CONFIG += waylandclient-private +!qtHaveModule(waylandcompositor): \ + return() + +SUBDIRS += compositor + qtConfig(wayland-client): \ SUBDIRS += client cmake -qtHaveModule(waylandcompositor): \ - SUBDIRS += compositor |