From b19b0808940c8c54b102012be134a370b26e348e Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@digia.com>
Date: Wed, 5 Feb 2014 16:25:06 +0100
Subject: Update bundled libxkbcommon version to 0.4.0

This release comes with important bug fixes. Also we can now
remove the workaround code which was needed for libxkbcommon 0.2.0.

Task-number: QTBUG-31712
Task-number: QTBUG-33732
Task-number: QTBUG-34056

Change-Id: I57caf7f803b9a01a15541a5ad82e464de3b8abbb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/plugins/platforminputcontexts/platforminputcontexts.pro | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/plugins/platforminputcontexts/platforminputcontexts.pro')

diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro
index 60b66bfb35..faea54b874 100644
--- a/src/plugins/platforminputcontexts/platforminputcontexts.pro
+++ b/src/plugins/platforminputcontexts/platforminputcontexts.pro
@@ -4,7 +4,6 @@ qtHaveModule(dbus) {
 !mac:!win32:SUBDIRS += ibus
 }
 
-unix:!macx:!contains(DEFINES, QT_NO_XKBCOMMON): {
-    SUBDIRS += compose
-}
+contains(QT_CONFIG, xcb-plugin): SUBDIRS += compose
+
 
-- 
cgit v1.2.3