From 9c1d62cc95ed2579fa25d83901c7a1aa315aa2d3 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 2 Apr 2013 17:25:19 +0200 Subject: Add xcb-xkb to 3rd party libs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1) -qt-xcb a) Use xkb from the 3rd party libs. As it is done for the other xcb dependencies when qt configure with -qt-xcb. 2) -system-xcb (default) a) If xkb found then use xkb from the system. (Currenly xkb is not enabled by default when configuring libxcb library). b) If xkb can't be found on the system then keyboard state will be updated from X11 core events. Change-Id: I7c3dbce6daa2cec52067cd5af80f19040233a0db Reviewed-by: Samuel Rødal --- src/plugins/platforms/xcb/xcb-plugin.pro | 1 + src/plugins/platforms/xcb/xcb-static/xcb-static.pro | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/plugins/platforms/xcb') diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro index 99429333d6..eb90f0ae10 100644 --- a/src/plugins/platforms/xcb/xcb-plugin.pro +++ b/src/plugins/platforms/xcb/xcb-plugin.pro @@ -113,6 +113,7 @@ contains(QT_CONFIG, xcb-qt) { } else { LIBS += -lxcb -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr !contains(DEFINES, QT_NO_SHAPE):LIBS += -lxcb-shape + !contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb } # libxkbcommon diff --git a/src/plugins/platforms/xcb/xcb-static/xcb-static.pro b/src/plugins/platforms/xcb/xcb-static/xcb-static.pro index 01667d41db..2fd5519053 100644 --- a/src/plugins/platforms/xcb/xcb-static/xcb-static.pro +++ b/src/plugins/platforms/xcb/xcb-static/xcb-static.pro @@ -24,7 +24,8 @@ SOURCES += \ $$LIBXCB_DIR/shm.c \ $$LIBXCB_DIR/sync.c \ $$LIBXCB_DIR/render.c \ - $$LIBXCB_DIR/shape.c + $$LIBXCB_DIR/shape.c \ + $$LIBXCB_DIR/xkb.c # # xcb-util -- cgit v1.2.3