Remove deprecated code

XdgShellv5 and XdgShellv6 have been deprecated in
the compositor since 5.15, and wl-scaler since 5.13.
These are now removed.

Since the qwindow-compositor has not been updated
for a long time, it depends on the outdated protocols.
This change removes it, since it no longer represents
best practices. This means we will be missing a proper
C++-based compositor for now, so we will have to
create a new one later.

Change-Id: Icc6ef97c17e553f266c4145abeef26ddd631d6bf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

1 files changed, 0 insertions, 48 deletions

diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index 0904a499d..a44aef2f3 100644
--- a/tests/auto/compositor/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
@@ -40,7 +40,6 @@
 
 #include <QtGui/QScreen>
 #include <QtWaylandCompositor/QWaylandXdgShell>
-#include <QtWaylandCompositor/private/qwaylandxdgshellv6_p.h>
 #include <QtWaylandCompositor/private/qwaylandkeyboard_p.h>
 #include <QtWaylandCompositor/QWaylandIviApplication>
 #include <QtWaylandCompositor/QWaylandIviSurface>
@@ -101,9 +100,6 @@ private slots:
     void sendsIviConfigure();
     void destroysIviSurfaces();
 
-    void convertsXdgEdgesToQtEdges();
-    void xdgShellV6Positioner();
-
     void viewporterGlobal();
     void viewportDestination();
     void viewportSource();
@@ -1320,50 +1316,6 @@ void tst_WaylandCompositor::destroysIviSurfaces()
     QTRY_VERIFY(destroySpy.count() == 1);
 }
 
-void tst_WaylandCompositor::convertsXdgEdgesToQtEdges()
-{
-    const uint wlLeft = ZXDG_POSITIONER_V6_ANCHOR_LEFT;
-    QCOMPARE(QWaylandXdgShellV6Private::convertToEdges(wlLeft), Qt::LeftEdge);
-
-    const uint wlRight = ZXDG_POSITIONER_V6_ANCHOR_RIGHT;
-    QCOMPARE(QWaylandXdgShellV6Private::convertToEdges(wlRight), Qt::RightEdge);
-
-    const uint wlTop = ZXDG_POSITIONER_V6_ANCHOR_TOP;
-    QCOMPARE(QWaylandXdgShellV6Private::convertToEdges(wlTop), Qt::TopEdge);
-
-    const uint wlBottom = ZXDG_POSITIONER_V6_ANCHOR_BOTTOM;
-    QCOMPARE(QWaylandXdgShellV6Private::convertToEdges(wlBottom), Qt::BottomEdge);
-
-    QCOMPARE(QWaylandXdgShellV6Private::convertToEdges(wlBottom | wlLeft), Qt::Edges(Qt::BottomEdge | Qt::LeftEdge));
-    QCOMPARE(QWaylandXdgShellV6Private::convertToEdges(wlTop | wlRight), Qt::Edges(Qt::TopEdge | Qt::RightEdge));
-}
-
-void tst_WaylandCompositor::xdgShellV6Positioner()
-{
-    QWaylandXdgPositionerV6Data p;
-    QVERIFY(!p.isComplete());
-
-    p.size = QSize(100, 50);
-    p.anchorRect = QRect(QPoint(1, 2), QSize(800, 600));
-    QVERIFY(p.isComplete());
-
-    p.anchorEdges = Qt::TopEdge | Qt::LeftEdge;
-    p.gravityEdges = Qt::BottomEdge | Qt::RightEdge;
-    QCOMPARE(p.unconstrainedPosition(), QPoint(1, 2));
-
-    p.anchorEdges = Qt::RightEdge;
-    QCOMPARE(p.unconstrainedPosition(), QPoint(1 + 800, 2 + 600 / 2));
-
-    p.gravityEdges = Qt::BottomEdge;
-    QCOMPARE(p.unconstrainedPosition(), QPoint(1 + 800 - 100 / 2, 2 + 600 / 2));
-
-    p.gravityEdges = Qt::TopEdge;
-    QCOMPARE(p.unconstrainedPosition(), QPoint(1 + 800 - 100 / 2, 2 + 600 / 2 - 50));
-
-    p.offset = QPoint(4, 8);
-    QCOMPARE(p.unconstrainedPosition(), QPoint(1 + 800 - 100 / 2 + 4, 2 + 600 / 2 - 50 + 8));
-}
-
 class ViewporterTestCompositor: public TestCompositor {
     Q_OBJECT
 public: