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/qxcbwindow.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/qxcbwindow.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h index a1f1540466..edfee1f574 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.h +++ b/src/plugins/platforms/xcb/qxcbwindow.h @@ -103,8 +103,6 @@ public: bool setKeyboardGrabEnabled(bool grab) override; bool setMouseGrabEnabled(bool grab) override; - void setCursor(xcb_cursor_t cursor, bool isBitmapCursor); - QSurfaceFormat format() const override; void windowEvent(QEvent *event) override; @@ -285,7 +283,6 @@ protected: SyncState m_syncState = NoSyncNeeded; QXcbSyncWindowRequest *m_pendingSyncRequest = nullptr; - xcb_cursor_t m_currentBitmapCursor = XCB_CURSOR_NONE; }; class QXcbForeignWindow : public QXcbWindow |