From 764a79e01dc6095fe625a45f7b617493ed61c5f2 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 16 Jun 2018 06:14:36 -0700 Subject: [PATCH] Fix build: some shells need to link to libxkbcommon They use QtWaylandClient's private headers. In file included from qwaylandinputdevice_p.h:1, from qwaylandxdgshellv6.cpp:45: qwaylandinputdevice_p.h:69:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory Change-Id: I6efb28c3145047559ec0fffd1538a642167da67f Reviewed-by: Oswald Buddenhagen Reviewed-by: Johan Helsing --- .../wayland/plugins/shellintegration/wl-shell/wl-shell.pro | 2 ++ .../plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro | 2 ++ .../wayland/plugins/shellintegration/xdg-shell/xdg-shell.pro | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/wl-shell.pro b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/wl-shell.pro index 211dc876f8e..fbff63c712e 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/wl-shell.pro +++ b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/wl-shell.pro @@ -2,6 +2,8 @@ QT += gui-private waylandclient-private CONFIG += wayland-scanner QMAKE_USE += wayland-client +qtConfig(xkbcommon-evdev): \ + QMAKE_USE_PRIVATE += xkbcommon_evdev WAYLANDCLIENTSOURCES += \ ../../../3rdparty/protocol/wayland.xml diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro index a5e0a51055f..5d5046f6066 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro @@ -2,6 +2,8 @@ QT += gui-private waylandclient-private CONFIG += wayland-scanner QMAKE_USE += wayland-client +qtConfig(xkbcommon-evdev): \ + QMAKE_USE_PRIVATE += xkbcommon_evdev WAYLANDCLIENTSOURCES += \ ../../../3rdparty/protocol/xdg-shell-unstable-v6.xml diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/xdg-shell.pro b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/xdg-shell.pro index b6d4a9b2ee6..1fabf2c64d4 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/xdg-shell.pro +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/xdg-shell.pro @@ -2,6 +2,8 @@ QT += gui-private waylandclient-private CONFIG += wayland-scanner QMAKE_USE += wayland-client +qtConfig(xkbcommon-evdev): \ + QMAKE_USE_PRIVATE += xkbcommon_evdev WAYLANDCLIENTSOURCES += \ ../../../3rdparty/protocol/xdg-shell.xml