diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-03-08 14:45:49 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-03-08 14:45:49 +0100 |
| commit | 85428526fb3e5a1605e8df2e009d333193809fae (patch) | |
| tree | 08ac5d72c773b2ad9cd27a87e29c5f4055fdbf35 /src/client/qwaylandwindow_p.h | |
| parent | 95ed69bd08f424b80524414fbc0456f315353cf5 (diff) | |
| parent | 19260d9846861212881e374229798b3863d1a78d (diff) | |
Merge remote-tracking branch 'qt/5.6' into 5.7
Change-Id: Iada0e076ee33e8d39ecc4f40edfd9764ba610c03
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index 30d158d30..c1346e666 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -214,7 +214,6 @@ protected: Qt::MouseButtons mMousePressedInContentArea; Qt::CursorShape m_cursorShape; - QWaylandBuffer *mBuffer; WId mWindowId; bool mWaitingForFrameSync; struct wl_callback *mFrameCallback; |