diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-06-16 15:36:56 +0200 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-07-18 13:19:11 +0000 |
| commit | 214fc329813d7c3375ec5d9e8f17de54d7ec42d3 (patch) | |
| tree | ecdbd9a6b3732bb931eb1e53b6d54bd079fa8701 /src/plugins/platforms/xcb/qxcbconnection.h | |
| parent | 900abb116d6f47e71bc2bdfa57553dd91786edf7 (diff) | |
xcb: fix build failure when XCB_USE_XINPUT22 is not defined
... and group XI22 methods together under one ifdef clause.
The error message was:
qxcbconnection_xi2.cpp:1025:42: error: no ‘bool QXcbConnection::isTouchScreen(int)’ member function declared in class ‘QXcbConnection’
bool QXcbConnection::isTouchScreen(int id)
XInput 2.2 was released many years ago, this build failure could
in practice happen only on some really old platform.
Change-Id: I3c1741cbdffe15c0f5149c6d76592a743d1d8a91
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index 15743c6328..6d13a1b82c 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -493,12 +493,15 @@ public: #ifdef XCB_USE_XINPUT21 void xi2UpdateScrollingDevices(); -#endif +#endif // XCB_USE_XINPUT21 #ifdef XCB_USE_XINPUT22 bool startSystemResizeForTouchBegin(xcb_window_t window, const QPoint &point, Qt::Corner corner); bool xi2SetMouseGrabEnabled(xcb_window_t w, bool grab); -#endif + bool xi2MouseEvents() const; + bool isTouchScreen(int id); +#endif // XCB_USE_XINPUT22 + Qt::MouseButton xiToQtMouseButton(uint32_t b); QXcbEventReader *eventReader() const { return m_reader; } @@ -507,11 +510,6 @@ public: QXcbGlIntegration *glIntegration() const { return m_glIntegration; } -#ifdef XCB_USE_XINPUT22 - bool xi2MouseEvents() const; - bool isTouchScreen(int id); -#endif - protected: bool event(QEvent *e) override; |