diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-03 01:00:24 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-03 01:00:25 +0100 |
commit | 84e15d6f485fe0e9a4549d57ef39dbc3d18eeaa9 (patch) | |
tree | b02e4541aac42302504b244f856062bda902cd0d /src/platformsupport/input/libinput/qlibinputkeyboard_p.h | |
parent | c6153660e458ee3790a446a327d29e622defee49 (diff) | |
parent | 607338f98feaa2561340c7ff4249d470b36d0503 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ic0037eac1d85a0e60e7b1a590d49b5ee6205bfc8
Diffstat (limited to 'src/platformsupport/input/libinput/qlibinputkeyboard_p.h')
-rw-r--r-- | src/platformsupport/input/libinput/qlibinputkeyboard_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/platformsupport/input/libinput/qlibinputkeyboard_p.h b/src/platformsupport/input/libinput/qlibinputkeyboard_p.h index 14ae71b545..7521902e02 100644 --- a/src/platformsupport/input/libinput/qlibinputkeyboard_p.h +++ b/src/platformsupport/input/libinput/qlibinputkeyboard_p.h @@ -79,10 +79,9 @@ 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; @@ -95,7 +94,6 @@ private: QString unicodeText; int repeatCount; } m_repeatData; - Qt::KeyboardModifiers m_mods; #endif }; |