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/plugins | |
| 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/plugins')
| -rw-r--r-- | src/plugins/hardwareintegration/hardwareintegration.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/hardwareintegration/hardwareintegration.pro b/src/plugins/hardwareintegration/hardwareintegration.pro index 59d867f9f..cb7a4b263 100644 --- a/src/plugins/hardwareintegration/hardwareintegration.pro +++ b/src/plugins/hardwareintegration/hardwareintegration.pro @@ -1,4 +1,4 @@ TEMPLATE=subdirs SUBDIRS += client -SUBDIRS += compositor +qtHaveModule(waylandcompositor): SUBDIRS += compositor |