diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-01-21 11:56:03 +0100 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2019-01-23 10:45:02 +0000 |
| commit | f9ba56f24e7d1fcc9d0dc5eabb55335fc64b9a56 (patch) | |
| tree | 1b867b43857da66f621de986d2a468b0f60d9d91 /src/src.pro | |
| parent | 8ec451781282d82650167b02acac3d79a51f873a (diff) | |
Fix platform integration not building with -no-feature-wayland-server
The plugins subdir which includes the platform plugins was not built without
the feature wayland-server. Moves the checks inside the plugins folder to make
it build.
Also disables some tests that won't pass without the compositor API.
Fixes: QTBUG-73169
Change-Id: Ie68badd2ff62ee544c31edaff7c732082e0a4115
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/src.pro b/src/src.pro index 4ecbc71b9..031ff885c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -13,6 +13,14 @@ qtConfig(wayland-client) { sub_client.target = sub-client SUBDIRS += sub_client + sub_plugins.subdir = plugins + sub_plugins.depends += sub-qtwaylandscanner sub-client + qtConfig(wayland-server) { + sub_plugins.depends += sub-compositor + } + sub_plugins.target = sub-plugins + SUBDIRS += sub_plugins + qtConfig(wayland-server) { sub_compositor.subdir = compositor sub_compositor.depends = sub-qtwaylandscanner @@ -23,11 +31,5 @@ qtConfig(wayland-client) { sub_imports.depends += sub-compositor sub_imports.target = sub-imports SUBDIRS += sub_imports - - sub_plugins.subdir = plugins - sub_plugins.depends = sub-qtwaylandscanner sub-client sub-compositor - sub_plugins.target = sub-plugins - SUBDIRS += sub_plugins } } - |