From cdafb5d0da87cd9a22620e566e21b20593dab996 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 5 May 2021 22:57:53 +0300 Subject: [PATCH] Remove irrelevant workarounds We have a local fork of qtwaylandscanner so we don't need any quirks to handle inert resources. --- src/wayland/xdgoutput_v1_interface.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/wayland/xdgoutput_v1_interface.cpp b/src/wayland/xdgoutput_v1_interface.cpp index 3ce3438672..32d41e0afd 100644 --- a/src/wayland/xdgoutput_v1_interface.cpp +++ b/src/wayland/xdgoutput_v1_interface.cpp @@ -112,20 +112,6 @@ XdgOutputV1Interface::XdgOutputV1Interface(OutputInterface *output, QObject *par XdgOutputV1Interface::~XdgOutputV1Interface() { -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 2) - // Starting from 5.15.2, qtwaylandscanner properly handles destruction of inert/orphaned resources. - - // Generated code typically cleans up resource objects when the client calls the relevant destructor - // In multi-cast mode our wrapper can be deleted at any time whilst a client resource exists. - // any existing resources that have a pending message will then crash the compositor. - - // Deleting resources ahead of time also resolves this. calls to this resource will no-op - const QMultiMap resourceMap = d->resourceMap(); - for (auto resource : resourceMap) - { - wl_resource_destroy(resource->handle); - } -#endif } void XdgOutputV1Interface::setLogicalSize(const QSize &size)