From d048f9aad84f3177739c4432040feb56238e4b13 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Fri, 24 May 2024 22:11:22 +0300
Subject: [PATCH] autotests: Destroy WaylandServer before Application

---
 autotests/integration/kwin_wayland_test.cpp | 3 ++-
 autotests/integration/kwin_wayland_test.h   | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/autotests/integration/kwin_wayland_test.cpp b/autotests/integration/kwin_wayland_test.cpp
index 57dfd88223..dad2e3a348 100644
--- a/autotests/integration/kwin_wayland_test.cpp
+++ b/autotests/integration/kwin_wayland_test.cpp
@@ -95,7 +95,7 @@ WaylandTestApplication::WaylandTestApplication(OperationMode mode, int &argc, ch
 
     setSession(Session::create(Session::Type::Noop));
     setOutputBackend(std::make_unique<VirtualBackend>());
-    WaylandServer::create(this);
+    m_waylandServer.reset(WaylandServer::create());
     setProcessStartupEnvironment(QProcessEnvironment::systemEnvironment());
 }
 
@@ -116,6 +116,7 @@ WaylandTestApplication::~WaylandTestApplication()
     destroyInputMethod();
     destroyCompositor();
     destroyInput();
+    m_waylandServer.reset();
 }
 
 void WaylandTestApplication::createVirtualInputDevices()
diff --git a/autotests/integration/kwin_wayland_test.h b/autotests/integration/kwin_wayland_test.h
index 0a08590baa..2371fd347a 100644
--- a/autotests/integration/kwin_wayland_test.h
+++ b/autotests/integration/kwin_wayland_test.h
@@ -73,6 +73,9 @@ class ScreencastingV1;
 
 namespace KWin
 {
+
+class WaylandServer;
+
 #if KWIN_BUILD_X11
 namespace Xwl
 {
@@ -113,6 +116,8 @@ private:
 
     void createVirtualInputDevices();
     void destroyVirtualInputDevices();
+
+    std::unique_ptr<WaylandServer> m_waylandServer;
 #if KWIN_BUILD_X11
     std::unique_ptr<Xwl::Xwayland> m_xwayland;
 #endif