diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-12 16:03:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-12 17:56:19 +0200 |
commit | 25a46893782979c74f57ab725b1ce55fbfc4fa2f (patch) | |
tree | 7e8773ca2ef85f28070574892ada681c5d2da030 | |
parent | 5ca9f28f4b272d3265b97c16029071a0070195a6 (diff) | |
download | qtwayland-25a46893782979c74f57ab725b1ce55fbfc4fa2f.tar.gz |
Fix the build when libs didn't get built
Change-Id: I641a1a80edd0861049d079422eef28b095fc26b3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-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 b9e4263e..5551b570 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 79ad29bd..d81339e8 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 |