diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 19:05:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 19:05:17 +0100 |
| commit | 573fbed837e2b7281c7a828cdcda141fbbcac030 (patch) | |
| tree | 8535b043edd0a06c4b01f63bbfb0ae0953cff9df /src/client/qwaylandwindow_p.h | |
| parent | 6341bf99c981aa3cfbb01589e499aa4b3f6dca21 (diff) | |
| parent | 3fcb77996b3e6c076d50db9ccf9da3aefd24f159 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/compositor/compositor_api/qwaylandcompositor.h
src/compositor/compositor_api/qwaylandquickcompositor.h
src/compositor/compositor_api/qwaylandsurfaceitem.h
src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration_p.h
Change-Id: I094128be314d2c3d4fe350fa7a162e37da34ae10
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index c1346e666..02671a933 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -174,7 +174,7 @@ public: inline bool isMaximized() const { return mState == Qt::WindowMaximized; } inline bool isFullscreen() const { return mState == Qt::WindowFullScreen; } - void setMouseCursor(QWaylandInputDevice *device, Qt::CursorShape shape); + void setMouseCursor(QWaylandInputDevice *device, const QCursor &cursor); void restoreMouseCursor(QWaylandInputDevice *device); QWaylandWindow *transientParent() const; @@ -212,7 +212,7 @@ protected: QWaylandAbstractDecoration *mWindowDecoration; bool mMouseEventsInContentArea; Qt::MouseButtons mMousePressedInContentArea; - Qt::CursorShape m_cursorShape; + QCursor m_cursor; WId mWindowId; bool mWaitingForFrameSync; |