summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2018-06-16 06:14:36 -0700
committerThiago Macieira <thiago.macieira@intel.com>2018-06-20 16:04:38 +0000
commit0b92f04c63d4a600047488d874995b637523f6d5 (patch)
treea3c878cedcbd162fda5498a6ea893fc648988d2e /src/plugins
parent593b9f82c18118a804c538537d9ded9580f5fe5d (diff)
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 <oswald.buddenhagen@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/shellintegration/wl-shell/wl-shell.pro2
-rw-r--r--src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro2
-rw-r--r--src/plugins/shellintegration/xdg-shell/xdg-shell.pro2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/shellintegration/wl-shell/wl-shell.pro b/src/plugins/shellintegration/wl-shell/wl-shell.pro
index 211dc876f..fbff63c71 100644
--- a/src/plugins/shellintegration/wl-shell/wl-shell.pro
+++ b/src/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/shellintegration/xdg-shell-v6/xdg-shell-v6.pro b/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro
index a5e0a5105..5d5046f60 100644
--- a/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro
+++ b/src/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/shellintegration/xdg-shell/xdg-shell.pro b/src/plugins/shellintegration/xdg-shell/xdg-shell.pro
index b6d4a9b2e..1fabf2c64 100644
--- a/src/plugins/shellintegration/xdg-shell/xdg-shell.pro
+++ b/src/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