Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I4c99725971d7c15448ca3f01306ae869af9ef057
2019-02-26 03:02:32 +01:00 · 2019-02-26 03:02:32 +01:00 · 6c3658b413
commit 6c3658b413
parent de2fd1db6b f07397208c
1 changed files with 1 additions and 0 deletions
--- a/src/plugins/platforms/wayland/configure.json
+++ b/src/plugins/platforms/wayland/configure.json
@ -1,5 +1,6 @@
 {
    "module": "waylandclient",
+    "condition": "module.gui",
    "depends": [
        "gui-private"
    ],