diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-03 14:29:41 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-03 14:30:21 +0100 |
| commit | b5ab7ee0d78a30863e3d11bd2ba10ba5f4854bf5 (patch) | |
| tree | d4ab3471f9f92e153fe320e0435a5740c794746b /src/plugins/platforms/xcb/qxcbconnection.h | |
| parent | ad9554a7f2d4b8a2af3efabc7bc69b9a0ae3751d (diff) | |
| parent | aff3e3c4a20aae52fdafaede8dfcbde2bc990104 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id13badc270db98806048753fd7fb658aa17f1ede
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index 3a71eb2574..9e64c37b94 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -572,6 +572,8 @@ private: bool has_input_shape; bool has_touch_without_mouse_emulation; bool has_xkb; + bool debug_xinput_devices; + bool debug_xinput; Qt::MouseButtons m_buttons; |