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>
---
 .../platforminputcontexts/compose/compose.pro        |  8 ++------
 .../compose/generator/qtablegenerator.cpp            | 20 --------------------
 .../platforminputcontexts/platforminputcontexts.pro  |  5 ++---
 3 files changed, 4 insertions(+), 29 deletions(-)

(limited to 'src/plugins/platforminputcontexts')

diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro
index 546a0a2af7..7182c458fc 100644
--- a/src/plugins/platforminputcontexts/compose/compose.pro
+++ b/src/plugins/platforminputcontexts/compose/compose.pro
@@ -6,8 +6,6 @@ load(qt_plugin)
 
 QT += gui-private
 
-LIBS += $$QMAKE_LIBS_XKBCOMMON
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
 DEFINES += X11_PREFIX='\\"$$QMAKE_X11_PREFIX\\"'
 
 SOURCES += $$PWD/main.cpp \
@@ -19,14 +17,12 @@ HEADERS += $$PWD/qcomposeplatforminputcontext.h \
 
 # libxkbcommon
 contains(QT_CONFIG, xkbcommon-qt): {
+    # dont't need x11 dependency for compose key plugin
+    QT_CONFIG -= use-xkbcommon-x11support
     include(../../../3rdparty/xkbcommon.pri)
 } else {
     LIBS += $$QMAKE_LIBS_XKBCOMMON
     QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
-    equals(QMAKE_VERSION_XKBCOMMON, "0.2.0") {
-        DEFINES += XKBCOMMON_0_2_0
-        INCLUDEPATH += ../../../3rdparty/xkbcommon/xkbcommon/
-    }
 }
 
 OTHER_FILES += $$PWD/compose.json
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index ca61b0e495..8bbb490022 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -51,10 +51,6 @@
 
 #include <xkbcommon/xkbcommon.h>
 
-#ifdef XKBCOMMON_0_2_0
-#include <xkbcommon_workaround.h>
-#endif
-
 #include <locale.h> // LC_CTYPE
 #include <string.h> // strchr, strncmp, etc.
 #include <strings.h> // strncasecmp
@@ -326,23 +322,7 @@ ushort TableGenerator::keysymToUtf8(quint32 sym)
     QByteArray chars;
     int bytes;
     chars.resize(8);
-
-#ifdef XKBCOMMON_0_2_0
-    if (needWorkaround(sym)) {
-        quint32 codepoint;
-        if (sym == XKB_KEY_KP_Space)
-            codepoint = XKB_KEY_space & 0x7f;
-        else
-            codepoint = sym & 0x7f;
-
-        bytes = utf32_to_utf8(codepoint, chars.data());
-    } else {
-        bytes = xkb_keysym_to_utf8(sym, chars.data(), chars.size());
-    }
-#else
     bytes = xkb_keysym_to_utf8(sym, chars.data(), chars.size());
-#endif
-
     if (bytes == -1)
         qWarning("TableGenerator::keysymToUtf8 - buffer too small");
 
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