diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-08-14 13:10:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-14 16:14:55 +0200 |
| commit | 7362413785e1e199a62320494631f27dd1a4da59 (patch) | |
| tree | e4973dbfb9ac67d7e78f6a780c8e41e5667f4099 /examples | |
| parent | ca9be5cab503d85831653d6c4bc9c59bd0f6ad57 (diff) | |
| parent | 43d8a3091894ceb4ab934167b2f3eda27564eb6d (diff) | |
Merge remote-tracking branch 'qt/5.12' into 5.13
Conflicts:
src/compositor/configure.json
sync.profile
tests/auto/auto.pro
Change-Id: Ia6d1512aa9ad49ac7f92ae88f23026dc0ee2ccc5
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wayland/wayland.pro | 8 |
1 files changed, 6 insertions, 2 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 |