5 files changed, 31 insertions, 9 deletions
diff --git a/tests/auto/client/shared/corecompositor.cpp b/tests/auto/client/shared/corecompositor.cpp
index 7edb1c2d4..5c6c83baa 100644
--- a/tests/auto/client/shared/corecompositor.cpp
+++ b/tests/auto/client/shared/corecompositor.cpp
@@ -43,6 +43,7 @@ CoreCompositor::CoreCompositor()
         }
     })
 {
+    qputenv("WAYLAND_DISPLAY", m_socketName);
     m_timer.start();
     Q_ASSERT(isClean());
 }
diff --git a/tests/auto/client/shared/coreprotocol.h b/tests/auto/client/shared/coreprotocol.h
index 5cef476c8..f92842e02 100644
--- a/tests/auto/client/shared/coreprotocol.h
+++ b/tests/auto/client/shared/coreprotocol.h
@@ -163,6 +163,16 @@ protected:
     }
 };
 
+class Subsurface : public QObject, public QtWaylandServer::wl_subsurface
+{
+    Q_OBJECT
+public:
+    explicit Subsurface(wl_client *client, int id, int version)
+        : QtWaylandServer::wl_subsurface(client, id, version)
+    {
+    }
+};
+
 class SubCompositor : public Global, public QtWaylandServer::wl_subcompositor
 {
     Q_OBJECT
@@ -170,7 +180,20 @@ public:
     explicit SubCompositor(CoreCompositor *compositor, int version = 1)
         : QtWaylandServer::wl_subcompositor(compositor->m_display, version)
     {}
-    // TODO
+    QVector<Subsurface *> m_subsurfaces;
+
+signals:
+    void subsurfaceCreated(Subsurface *subsurface);
+
+protected:
+    void subcompositor_get_subsurface(Resource *resource, uint32_t id, ::wl_resource *surface, ::wl_resource *parent) override
+    {
+        QTRY_VERIFY(parent);
+        QTRY_VERIFY(surface);
+        auto *subsurface = new Subsurface(resource->client(), id, resource->version());
+        m_subsurfaces.append(subsurface); // TODO: clean up?
+        emit subsurfaceCreated(subsurface);
+    }
 };
 
 struct OutputMode {
diff --git a/tests/auto/client/shared/mockcompositor.cpp b/tests/auto/client/shared/mockcompositor.cpp
index 6b9af4295..0711c5d8e 100644
--- a/tests/auto/client/shared/mockcompositor.cpp
+++ b/tests/auto/client/shared/mockcompositor.cpp
@@ -58,13 +58,10 @@ DefaultCompositor::DefaultCompositor()
             });
         });
 
-        QObject::connect(get<XdgWmBase>(), &XdgWmBase::toplevelCreated, [&] (XdgToplevel *toplevel) {
-            // Needed because lambdas don't support Qt::DirectConnection
-            exec([&]{
-                if (m_config.autoConfigure)
-                    toplevel->sendCompleteConfigure();
-            });
-        });
+        QObject::connect(get<XdgWmBase>(), &XdgWmBase::toplevelCreated, get<XdgWmBase>(), [&] (XdgToplevel *toplevel) {
+            if (m_config.autoConfigure)
+                toplevel->sendCompleteConfigure();
+        }, Qt::DirectConnection);
     }
     Q_ASSERT(isClean());
 }
diff --git a/tests/auto/client/shared/mockcompositor.h b/tests/auto/client/shared/mockcompositor.h
index f5264ccf6..f17c93426 100644
--- a/tests/auto/client/shared/mockcompositor.h
+++ b/tests/auto/client/shared/mockcompositor.h
@@ -50,6 +50,7 @@ public:
     // Convenience functions
     Output *output(int i = 0) { return getAll<Output>().value(i, nullptr); }
     Surface *surface(int i = 0) { return get<WlCompositor>()->m_surfaces.value(i, nullptr); }
+    Subsurface *subSurface(int i = 0) { return get<SubCompositor>()->m_subsurfaces.value(i, nullptr); }
     XdgSurface *xdgSurface(int i = 0) { return get<XdgWmBase>()->m_xdgSurfaces.value(i, nullptr); }
     XdgToplevel *xdgToplevel(int i = 0) { return get<XdgWmBase>()->toplevel(i); }
     XdgPopup *xdgPopup(int i = 0) { return get<XdgWmBase>()->popup(i); }
diff --git a/tests/auto/client/shared/xdgshell.cpp b/tests/auto/client/shared/xdgshell.cpp
index 13acc01e2..72582f48d 100644
--- a/tests/auto/client/shared/xdgshell.cpp
+++ b/tests/auto/client/shared/xdgshell.cpp
@@ -83,7 +83,7 @@ XdgSurface::XdgSurface(XdgWmBase *xdgWmBase, Surface *surface, wl_client *client
 {
     QVERIFY(!surface->m_pending.buffer);
     QVERIFY(!surface->m_committed.buffer);
-    connect(this, &XdgSurface::toplevelCreated, xdgWmBase, &XdgWmBase::toplevelCreated);
+    connect(this, &XdgSurface::toplevelCreated, xdgWmBase, &XdgWmBase::toplevelCreated, Qt::DirectConnection);
     connect(surface, &Surface::attach, this, &XdgSurface::verifyConfigured);
     connect(surface, &Surface::commit, this, [this] {
         m_committed = m_pending;