diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-03-06 13:52:05 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-03-19 08:16:23 +0100 |
commit | c27fe5ba93b0123709ce1d20b17395a939b4d5dd (patch) | |
tree | ea101722d9796b751c3d78223634521b02de752a | |
parent | e2d22eebca3b2dc11279e6e6fd46aa3d60db8c6b (diff) |
Implement cursor API in platform screen.
Change-Id: I345852d407ab1dceb84ba99227dfd2989a54c6ad
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
-rw-r--r-- | src/plugins/platforms/wayland/qwaylandcursor.cpp | 3 | ||||
-rw-r--r-- | src/plugins/platforms/wayland/qwaylandscreen.cpp | 5 | ||||
-rw-r--r-- | src/plugins/platforms/wayland/qwaylandscreen.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandcursor.cpp b/src/plugins/platforms/wayland/qwaylandcursor.cpp index 7e094a8d3..e8e7ef1e7 100644 --- a/src/plugins/platforms/wayland/qwaylandcursor.cpp +++ b/src/plugins/platforms/wayland/qwaylandcursor.cpp @@ -103,8 +103,7 @@ static const struct pointer_image { }; QWaylandCursor::QWaylandCursor(QWaylandScreen *screen) - : QPlatformCursor(screen) - , mBuffer(0) + : mBuffer(0) , mDisplay(screen->display()) { } diff --git a/src/plugins/platforms/wayland/qwaylandscreen.cpp b/src/plugins/platforms/wayland/qwaylandscreen.cpp index b0bb5189e..e81d5bc0a 100644 --- a/src/plugins/platforms/wayland/qwaylandscreen.cpp +++ b/src/plugins/platforms/wayland/qwaylandscreen.cpp @@ -95,6 +95,11 @@ Qt::ScreenOrientation QWaylandScreen::orientation() const return QPlatformScreen::orientation(); } +QPlatformCursor *QWaylandScreen::cursor() const +{ + return mWaylandCursor; +} + QWaylandExtendedOutput *QWaylandScreen::extendedOutput() const { return mExtendedOutput; diff --git a/src/plugins/platforms/wayland/qwaylandscreen.h b/src/plugins/platforms/wayland/qwaylandscreen.h index fb99699d1..6e62174bc 100644 --- a/src/plugins/platforms/wayland/qwaylandscreen.h +++ b/src/plugins/platforms/wayland/qwaylandscreen.h @@ -62,6 +62,8 @@ public: Qt::ScreenOrientation orientation() const; + QPlatformCursor *cursor() const; + wl_output *output() const { return mOutput; } QWaylandExtendedOutput *extendedOutput() const; |