1 files changed, 7 insertions, 7 deletions
diff --git a/src/platformsupport/input/libinput/qlibinputkeyboard_p.h b/src/platformsupport/input/libinput/qlibinputkeyboard_p.h
index 9e09bccd79..7521902e02 100644
--- a/src/platformsupport/input/libinput/qlibinputkeyboard_p.h
+++ b/src/platformsupport/input/libinput/qlibinputkeyboard_p.h
@@ -43,7 +43,9 @@
 #include <QtCore/QPoint>
 #include <QtCore/QTimer>
 
-#ifndef QT_NO_XKBCOMMON_EVDEV
+#include <QtGui/private/qtguiglobal_p.h>
+
+#if QT_CONFIG(xkbcommon)
 #include <xkbcommon/xkbcommon.h>
 #endif
 
@@ -70,17 +72,16 @@ public:
 
     void processKey(libinput_event_keyboard *e);
 
-#ifndef QT_NO_XKBCOMMON_EVDEV
+#if QT_CONFIG(xkbcommon)
     void handleRepeat();
 
 private:
     int keysymToQtKey(xkb_keysym_t key) const;
     int keysymToQtKey(xkb_keysym_t keysym, Qt::KeyboardModifiers *modifiers, const QString &text) const;
 
-    xkb_context *m_ctx;
-    xkb_keymap *m_keymap;
-    xkb_state *m_state;
-    xkb_mod_index_t m_modindex[4];
+    xkb_context *m_ctx = nullptr;
+    xkb_keymap *m_keymap = nullptr;
+    xkb_state *m_state = nullptr;
 
     QTimer m_repeatTimer;
 
@@ -93,7 +94,6 @@ private:
         QString unicodeText;
         int repeatCount;
     } m_repeatData;
-    Qt::KeyboardModifiers m_mods;
 #endif
 };