3 files changed, 1 insertions, 85 deletions

diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp
index 9ad19c546..edae5b063 100644
--- a/examples/wayland/server-buffer/compositor/main.cpp
+++ b/examples/wayland/server-buffer/compositor/main.cpp
@@ -214,7 +214,7 @@ private slots:
 protected:
     void sizeAdjusted()
     {
-        setOutputGeometry(QRect(QPoint(0, 0), m_view.size()));
+        primaryOutputSpace()->primaryOutput()->setGeometry(QRect(QPoint(0, 0), m_view.size()));
     }
 
     void onSurfaceCreated(QWaylandSurface *surface) {
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index d1824487f..d358b1d86 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -245,67 +245,6 @@ void QWaylandCompositor::overrideSelection(const QMimeData *data)
     m_compositor->overrideSelection(data);
 }
 
-#if QT_DEPRECATED_SINCE(5, 5)
-/*!
-  Set the screen orientation based on accelerometer data or similar.
-*/
-void QWaylandCompositor::setScreenOrientation(Qt::ScreenOrientation orientation)
-{
-    QWaylandOutput *output = primaryOutput();
-    if (output) {
-        bool isPortrait = output->window()->screen()->primaryOrientation() == Qt::PortraitOrientation;
-
-        switch (orientation) {
-        case Qt::PrimaryOrientation:
-            output->setTransform(QWaylandOutput::TransformNormal);
-            break;
-        case Qt::LandscapeOrientation:
-            output->setTransform(isPortrait ? QWaylandOutput::Transform270 : QWaylandOutput::TransformNormal);
-            break;
-        case Qt::PortraitOrientation:
-            output->setTransform(isPortrait ? QWaylandOutput::TransformNormal : QWaylandOutput::Transform90);
-            break;
-        case Qt::InvertedLandscapeOrientation:
-            output->setTransform(isPortrait ? QWaylandOutput::Transform90 : QWaylandOutput::Transform180);
-            break;
-        case Qt::InvertedPortraitOrientation:
-            output->setTransform(isPortrait ? QWaylandOutput::Transform180 : QWaylandOutput::Transform270);
-            break;
-        }
-    }
-}
-
-void QWaylandCompositor::setOutputGeometry(const QRect &geometry)
-{
-    QWaylandOutput *output = primaryOutput();
-    if (output)
-        output->setGeometry(geometry);
-}
-
-QRect QWaylandCompositor::outputGeometry() const
-{
-    QWaylandOutput *output = primaryOutput();
-    if (output)
-        return output->geometry();
-    return QRect();
-}
-
-void QWaylandCompositor::setOutputRefreshRate(int rate)
-{
-    QWaylandOutput *output = primaryOutput();
-    if (output)
-        output->setMode({output->mode().size, rate});
-}
-
-int QWaylandCompositor::outputRefreshRate() const
-{
-    QWaylandOutput *output = primaryOutput();
-    if (output)
-        return output->mode().refreshRate;
-    return 0;
-}
-#endif
-
 QWaylandInputDevice *QWaylandCompositor::defaultInputDevice() const
 {
     return m_compositor->defaultInputDevice();
@@ -332,15 +271,6 @@ void QWaylandCompositor::sendDragEndEvent()
     m_compositor->sendDragEndEvent();
 }
 
-#if QT_DEPRECATED_SINCE(5, 5)
-void QWaylandCompositor::setCursorSurface(QWaylandSurface *surface, int hotspotX, int hotspotY)
-{
-    Q_UNUSED(surface);
-    Q_UNUSED(hotspotX);
-    Q_UNUSED(hotspotY);
-}
-#endif
-
 QWaylandInputDevice *QWaylandCompositor::inputDeviceFor(QInputEvent *inputEvent)
 {
     return m_compositor->inputDeviceFor(inputEvent);
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index c8b95bbd7..3eef0adfa 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -130,16 +130,6 @@ public:
     bool retainedSelectionEnabled() const;
     void overrideSelection(const QMimeData *data);
 
-#if QT_DEPRECATED_SINCE(5, 5)
-    void setScreenOrientation(Qt::ScreenOrientation orientation);
-
-    void setOutputGeometry(const QRect &outputGeometry);
-    QRect outputGeometry() const;
-
-    void setOutputRefreshRate(int refreshRate);
-    int outputRefreshRate() const;
-#endif
-
     QWaylandInputDevice *defaultInputDevice() const;
 
     QWaylandDrag *drag() const;
@@ -148,10 +138,6 @@ public:
     void sendDragMoveEvent(const QPoint &global, const QPoint &local, QWaylandSurface *surface);
     void sendDragEndEvent();
 
-#if QT_DEPRECATED_SINCE(5, 5)
-    QT_DEPRECATED virtual void setCursorSurface(QWaylandSurface *surface, int hotspotX, int hotspotY);
-#endif
-
     void cleanupGraphicsResources();
 
     QWaylandView *createSurfaceView(QWaylandSurface *surface);