diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-11-19 16:32:12 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-12-05 15:44:31 +0000 |
| commit | a8fed20181729cae70de43079c4a34ad1780cfd7 (patch) | |
| tree | 60a84fd1cf8c3c6a2b58a226ae9f5d43c23bbac9 /src/shared | |
| parent | fb0109c6acb8269d1fcdc20b7494c455ff2c74ad (diff) | |
use new feature name xkbcommon_evdev -> xkbcommon
The xkbcommon configure logic was refactored in
qtbase/c3a963da1f9e7b1d37e63eedded61da4fbdaaf9a.
For more details see the relevant commit.
Change-Id: Ic1aa26846ab8266c589f6e92dc8b81aba36df58a
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/qwaylandxkb.cpp | 10 | ||||
| -rw-r--r-- | src/shared/qwaylandxkb_p.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/shared/qwaylandxkb.cpp b/src/shared/qwaylandxkb.cpp index a0e388a1c..3cfc4b074 100644 --- a/src/shared/qwaylandxkb.cpp +++ b/src/shared/qwaylandxkb.cpp @@ -43,13 +43,13 @@ #include <QKeyEvent> #include <QString> -#if QT_CONFIG(xkbcommon_evdev) +#if QT_CONFIG(xkbcommon) #include <xkbcommon/xkbcommon-keysyms.h> #endif QT_BEGIN_NAMESPACE -#if QT_CONFIG(xkbcommon_evdev) +#if QT_CONFIG(xkbcommon) static const uint32_t KeyTbl[] = { XKB_KEY_Escape, Qt::Key_Escape, XKB_KEY_Tab, Qt::Key_Tab, @@ -297,7 +297,7 @@ static xkb_keysym_t toKeysymFromTable(uint32_t key) std::pair<int, QString> QWaylandXkb::keysymToQtKey(xkb_keysym_t keysym, Qt::KeyboardModifiers &modifiers) { -#if QT_CONFIG(xkbcommon_evdev) +#if QT_CONFIG(xkbcommon) QString text; uint utf32 = xkb_keysym_to_utf32(keysym); if (utf32) @@ -339,7 +339,7 @@ std::pair<int, QString> QWaylandXkb::keysymToQtKey(xkb_keysym_t keysym, Qt::Keyb Qt::KeyboardModifiers QWaylandXkb::modifiers(struct xkb_state *state) { -#if QT_CONFIG(xkbcommon_evdev) +#if QT_CONFIG(xkbcommon) Qt::KeyboardModifiers modifiers = Qt::NoModifier; xkb_state_component cstate = static_cast<xkb_state_component>(XKB_STATE_DEPRESSED | XKB_STATE_LATCHED | XKB_STATE_LOCKED); @@ -367,7 +367,7 @@ QEvent::Type QWaylandXkb::toQtEventType(uint32_t state) QVector<xkb_keysym_t> QWaylandXkb::toKeysym(QKeyEvent *event) { -#if QT_CONFIG(xkbcommon_evdev) +#if QT_CONFIG(xkbcommon) QVector<xkb_keysym_t> keysyms; if (event->key() >= Qt::Key_F1 && event->key() <= Qt::Key_F35) { keysyms.append(XKB_KEY_F1 + (event->key() - Qt::Key_F1)); diff --git a/src/shared/qwaylandxkb_p.h b/src/shared/qwaylandxkb_p.h index 6fa1ea45b..4820d94be 100644 --- a/src/shared/qwaylandxkb_p.h +++ b/src/shared/qwaylandxkb_p.h @@ -45,7 +45,7 @@ #include <Qt> #include <QEvent> -#if QT_CONFIG(xkbcommon_evdev) +#if QT_CONFIG(xkbcommon) #include <xkbcommon/xkbcommon.h> #else typedef quint32 xkb_keysym_t; |