diff options
Diffstat (limited to 'src/plugins')
5 files changed, 5 insertions, 53 deletions
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 + diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp index 966090dbd5..0a52640c9a 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp +++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp @@ -53,10 +53,6 @@ #include <qpa/qplatformintegration.h> #include <qpa/qplatformcursor.h> -#ifdef XKBCOMMON_0_2_0 -#include <xkbcommon_workaround.h> -#endif - #ifndef XK_ISO_Left_Tab #define XK_ISO_Left_Tab 0xFE20 #endif @@ -1398,23 +1394,7 @@ QString QXcbKeyboard::keysymToUnicode(xcb_keysym_t sym) const QByteArray chars; int bytes; chars.resize(7); - -#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("QXcbKeyboard::handleKeyEvent - buffer too small"); chars.resize(bytes-1); diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro index bfbec91e3c..e19bb921e1 100644 --- a/src/plugins/platforms/xcb/xcb-plugin.pro +++ b/src/plugins/platforms/xcb/xcb-plugin.pro @@ -131,12 +131,9 @@ contains(QT_CONFIG, xcb-qt) { # libxkbcommon contains(QT_CONFIG, xkbcommon-qt): { + 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/ - } } |