diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-26 03:02:32 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-26 03:02:32 +0100 |
| commit | 2f0e6d773647d2112fcf34ab0d9d724f8278477c (patch) | |
| tree | 76a52e28e5dcaea5ec0e4ef9bf66d5e5bfbe4f47 | |
| parent | 81e154e264274907e329bfb1d54d20e0db0bbfd2 (diff) | |
| parent | 7206b4e8b6e10f5623b19ca132f538066c96aab5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I4c99725971d7c15448ca3f01306ae869af9ef057
| -rw-r--r-- | src/client/configure.json | 1 | ||||
| -rw-r--r-- | src/compositor/configure.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/client/configure.json b/src/client/configure.json index b5146680e..93c5d4e49 100644 --- a/src/client/configure.json +++ b/src/client/configure.json @@ -1,5 +1,6 @@ { "module": "waylandclient", + "condition": "module.gui", "depends": [ "gui-private" ], diff --git a/src/compositor/configure.json b/src/compositor/configure.json index ec9327adf..aabd2472f 100644 --- a/src/compositor/configure.json +++ b/src/compositor/configure.json @@ -1,5 +1,6 @@ { "module": "waylandcompositor", + "condition": "module.gui", "depends": [ "gui-private" ], |