autotests: Destroy WaylandServer before Application
This commit is contained in:
parent
79238b06cf
commit
d048f9aad8
2 changed files with 7 additions and 1 deletions
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue