4 files changed, 42 insertions, 18 deletions
diff --git a/tests/auto/compositor/compositor/mockclient.cpp b/tests/auto/compositor/compositor/mockclient.cpp
index 76ccd0c58..53e10d687 100644
--- a/tests/auto/compositor/compositor/mockclient.cpp
+++ b/tests/auto/compositor/compositor/mockclient.cpp
@@ -166,7 +166,7 @@ void MockClient::handleGlobalRemove(void *data, wl_registry *wl_registry, uint32
 void MockClient::handleGlobal(uint32_t id, const QByteArray &interface)
 {
     if (interface == "wl_compositor") {
-        compositor = static_cast<wl_compositor *>(wl_registry_bind(registry, id, &wl_compositor_interface, 3));
+        compositor = static_cast<wl_compositor *>(wl_registry_bind(registry, id, &wl_compositor_interface, 4));
     } else if (interface == "wl_output") {
         auto output = static_cast<wl_output *>(wl_registry_bind(registry, id, &wl_output_interface, 2));
         m_outputs.insert(id, output);
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index a44aef2f3..902f420de 100644
--- a/tests/auto/compositor/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
@@ -531,8 +531,6 @@ void tst_WaylandCompositor::mapSurfaceHiDpi()
     };
 
     QObject::connect(waylandSurface, &QWaylandSurface::damaged, [=] (const QRegion &damage) {
-        // Currently, QWaylandSurface::size returns the size in pixels.
-        // Should be fixed or removed for Qt 6.
         QCOMPARE(damage, QRect(QPoint(), surfaceSize));
         verifyComittedState();
     });
@@ -570,6 +568,12 @@ void tst_WaylandCompositor::mapSurfaceHiDpi()
     QTRY_COMPARE(destinationSizeSpy.count(), 1);
     QTRY_COMPARE(bufferScaleSpy.count(), 1);
     QTRY_COMPARE(offsetSpy.count(), 1);
+    QTRY_COMPARE(damagedSpy.count(), 1);
+
+    // Now verify that wl_surface_damage_buffer gets mapped properly
+    wl_surface_damage_buffer(surface, 0, 0, bufferSize.width(), bufferSize.height());
+    wl_surface_commit(surface);
+    QTRY_COMPARE(damagedSpy.count(), 2);
 
     wl_surface_destroy(surface);
 }
diff --git a/tests/manual/scaling-compositor/main.qml b/tests/manual/scaling-compositor/main.qml
index 056af4e5b..655bae1c2 100644
--- a/tests/manual/scaling-compositor/main.qml
+++ b/tests/manual/scaling-compositor/main.qml
@@ -48,10 +48,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.2
+import QtQuick 2.15
 import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
-import QtWayland.Compositor 1.0
+import QtWayland.Compositor 1.3
 
 WaylandCompositor {
     id: comp
@@ -66,16 +65,7 @@ WaylandCompositor {
             height: 500
             visible: true
             title: "Scaling compositor x" + output.scaleFactor
-            Button {
-                id: incrementButton
-                text: "+"
-                onClicked: ++output.scaleFactor
-            }
-            Button {
-                text: "-"
-                onClicked: output.scaleFactor = Math.max(1, output.scaleFactor - 1)
-                anchors.left: incrementButton.right
-            }
+
             Repeater {
                 model: shellSurfaces
                 ShellSurfaceItem {
@@ -83,6 +73,33 @@ WaylandCompositor {
                     onSurfaceDestroyed: shellSurfaces.remove(index);
                 }
             }
+
+            Rectangle {
+                id: incrementButton
+                color: "#c0f0d0"
+                Text {
+                    text: "+"
+                }
+                width: 100
+                height: 30
+                TapHandler {
+                    onTapped: ++output.scaleFactor
+                }
+            }
+
+            Rectangle {
+                id: decrementButton
+                color: "#f0d0c0"
+                Text {
+                    text: "-"
+                }
+                width: 100
+                height: 30
+                TapHandler {
+                    onTapped: output.scaleFactor = Math.max(1, output.scaleFactor - 1)
+                }
+                anchors.left: incrementButton.right
+            }
         }
     }
 
@@ -91,4 +108,8 @@ WaylandCompositor {
     WlShell {
         onWlShellSurfaceCreated: shellSurfaces.append({shellSurface: shellSurface});
     }
+    XdgShell {
+        onToplevelCreated:
+            shellSurfaces.append({shellSurface: xdgSurface});
+    }
 }
diff --git a/tests/manual/scaling-compositor/scaling-compositor.pro b/tests/manual/scaling-compositor/scaling-compositor.pro
index 847e07ea7..200dc8c40 100644
--- a/tests/manual/scaling-compositor/scaling-compositor.pro
+++ b/tests/manual/scaling-compositor/scaling-compositor.pro
@@ -1,7 +1,6 @@
 TEMPLATE = app
 
-QT += gui qml quickcontrols2
-
+QT += gui qml
 SOURCES += main.cpp
 
 RESOURCES += qml.qrc