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/qwaylanddisplay_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/qwaylanddisplay_p.h')
| -rw-r--r-- | src/client/qwaylanddisplay_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index a1e71acc3..82d87cb92 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -124,6 +124,7 @@ public: QWaylandWindowManagerIntegration *windowManagerIntegration() const; void setCursor(struct wl_buffer *buffer, struct wl_cursor_image *image); + void setCursor(const QSharedPointer<QWaylandBuffer> &buffer, const QPoint &hotSpot); struct wl_display *wl_display() const { return mDisplay; } struct ::wl_registry *wl_registry() { return object(); } |