Make QWaylandOutput::handle const

Change-Id: I880cb15e056de4f6f5dcf97ea570d7bfb625c294

3 files changed, 6 insertions, 7 deletions

diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp
index a055e3969..13b6f5880 100644
--- a/src/compositor/compositor_api/qwaylandoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandoutput.cpp
@@ -238,11 +238,6 @@ QWindow *QWaylandOutput::window() const
     return d_ptr->window();
 }
 
-QtWayland::Output *QWaylandOutput::handle()
-{
-    return d_ptr.data();
-}
-
 void QWaylandOutput::frameStarted()
 {
     d_ptr->frameStarted();
@@ -273,4 +268,9 @@ void QWaylandOutput::removeSurface(QWaylandSurface *surface)
     d_ptr->removeSurface(surface);
 }
 
+QtWayland::Output *QWaylandOutput::handle() const
+{
+    return d_ptr.data();
+}
+
 QT_END_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h
index 6d6223535..0dca144d9 100644
--- a/src/compositor/compositor_api/qwaylandoutput.h
+++ b/src/compositor/compositor_api/qwaylandoutput.h
@@ -147,7 +147,7 @@ public:
     void addSurface(QWaylandSurface *surface);
     void removeSurface(QWaylandSurface *surface);
 
-    QtWayland::Output *handle();
+    QtWayland::Output *handle() const;
 
 Q_SIGNALS:
     void positionChanged();
diff --git a/src/compositor/wayland_wrapper/qwlcompositor_p.h b/src/compositor/wayland_wrapper/qwlcompositor_p.h
index 9621c37bf..0228caaa2 100644
--- a/src/compositor/wayland_wrapper/qwlcompositor_p.h
+++ b/src/compositor/wayland_wrapper/qwlcompositor_p.h
@@ -70,7 +70,6 @@ class Surface;
 class SurfaceBuffer;
 class InputDevice;
 class DataDeviceManager;
-class OutputGlobal;
 class SurfaceExtensionGlobal;
 class SubSurfaceExtensionGlobal;
 class TouchExtensionGlobal;