diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:03:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:03:38 +0200 |
| commit | 6260c4376e598031e467416027703bd11012621d (patch) | |
| tree | 993f83d4105f228f4cb6bed1da600dc671be2ed4 /src/client/qwaylandinputdevice_p.h | |
| parent | 45d43ca1d9c4edca378f21530f184433cc629431 (diff) | |
| parent | d8b4bef3ddff327598027c8f94a61e3d0b61a2dd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I75a8ddc0652f3c6f438ef98e940c9357450d29c6
Diffstat (limited to 'src/client/qwaylandinputdevice_p.h')
| -rw-r--r-- | src/client/qwaylandinputdevice_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h index 3954328f1..ea685223d 100644 --- a/src/client/qwaylandinputdevice_p.h +++ b/src/client/qwaylandinputdevice_p.h @@ -197,7 +197,6 @@ public: xkb_keymap *mXkbMap; xkb_state *mXkbState; #endif - struct wl_callback *mFocusCallback; uint32_t mNativeModifiers; int mRepeatKey; @@ -209,9 +208,6 @@ public: #endif QTimer mRepeatTimer; - static const wl_callback_listener callback; - static void focusCallback(void *data, struct wl_callback *callback, uint32_t time); - Qt::KeyboardModifiers modifiers() const; private slots: |