diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-15 01:00:18 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-15 01:00:18 +0200 |
| commit | 4aa6f54fec9d199f97759945118451c52767b2ce (patch) | |
| tree | 5dc695cd4718437b5015aaef3a02463c61bc5dc2 /src/plugins/platforms/xcb/qxcbconnection.h | |
| parent | 369e7572bac94bb5b83ef881012fdc4a86829496 (diff) | |
| parent | d5ac11891d8237ca2f02390ffd0ff103578b520e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I8c353b4c53e90434453c76691eac39a894d23b49
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index 9e16d15b20..3b42d7cf22 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -464,7 +464,13 @@ public: bool hasXRandr() const { return has_randr_extension; } bool hasInputShape() const { return has_input_shape; } bool hasXKB() const { return has_xkb; } - bool hasXRender() const { return has_render_extension; } + bool hasXRender(int major = -1, int minor = -1) const + { + if (has_render_extension && major != -1 && minor != -1) + return m_xrenderVersion >= qMakePair(major, minor); + + return has_render_extension; + } bool hasXInput2() const { return m_xi2Enabled; } bool hasShm() const { return has_shm; } bool hasShmFd() const { return has_shm_fd; } @@ -685,6 +691,8 @@ private: bool has_shm = false; bool has_shm_fd = false; + QPair<int, int> m_xrenderVersion; + Qt::MouseButtons m_buttonState = 0; Qt::MouseButton m_button = Qt::NoButton; |