1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build: some shells need to link to libxkbcommon

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2018-06-16 06:14:36 -07:00
parent f2610e8d76
commit 764a79e01d
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/wl-shell.pro
View File

@ -2,6 +2,8 @@ QT += gui-private waylandclient-private
CONFIG += wayland-scanner CONFIG += wayland-scanner
QMAKE_USE += wayland-client QMAKE_USE += wayland-client
qtConfig(xkbcommon-evdev): \
QMAKE_USE_PRIVATE += xkbcommon_evdev
WAYLANDCLIENTSOURCES += \ WAYLANDCLIENTSOURCES += \
../../../3rdparty/protocol/wayland.xml ../../../3rdparty/protocol/wayland.xml

2
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro
View File

@ -2,6 +2,8 @@ QT += gui-private waylandclient-private
CONFIG += wayland-scanner CONFIG += wayland-scanner
QMAKE_USE += wayland-client QMAKE_USE += wayland-client
qtConfig(xkbcommon-evdev): \
QMAKE_USE_PRIVATE += xkbcommon_evdev
WAYLANDCLIENTSOURCES += \ WAYLANDCLIENTSOURCES += \
../../../3rdparty/protocol/xdg-shell-unstable-v6.xml ../../../3rdparty/protocol/xdg-shell-unstable-v6.xml

2
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/xdg-shell.pro
View File

@ -2,6 +2,8 @@ QT += gui-private waylandclient-private
CONFIG += wayland-scanner CONFIG += wayland-scanner
QMAKE_USE += wayland-client QMAKE_USE += wayland-client
qtConfig(xkbcommon-evdev): \
QMAKE_USE_PRIVATE += xkbcommon_evdev
WAYLANDCLIENTSOURCES += \ WAYLANDCLIENTSOURCES += \
../../../3rdparty/protocol/xdg-shell.xml ../../../3rdparty/protocol/xdg-shell.xml