Compositor: Use customized version of generated files for xdg-shell-v5

Checking in wayland-scanner and qtwaylandscanner generated files with renamed
symbols to avoid conflicts with xdg-shell stable.

Task-number: QTBUG-66784
Change-Id: I1b1a055d3be12bfa7d16e7bb7209e96497cbf28c
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

9 files changed, 2388 insertions, 11 deletions

diff --git a/src/3rdparty/protocol/qt_attribution.json b/src/3rdparty/protocol/qt_attribution.json
index 6034508ba..0a7954989 100644
--- a/src/3rdparty/protocol/qt_attribution.json
+++ b/src/3rdparty/protocol/qt_attribution.json
@@ -57,7 +57,7 @@ Copyright (c) 2013 BMW Car IT GmbH"
         "Name": "Wayland XDG Shell Protocol",
         "QDocModule": "qtwaylandcompositor",
         "QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
-        "Files": "xdg-shell-unstable-v5.xml xdg-shell-unstable-v6.xml xdg-shell.xml",
+        "Files": "xdg-shell-unstable-v5.xml xdg-shell-unstable-v6.xml xdg-shell.xml ../../compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5.cpp ../../compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h ../../compositor/extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-protocol.c ../../compositor/extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-server-protocol_p.h",
 
         "Description": "The XDG-Shell protocol is an extended way to manage surfaces under Wayland compositors.",
         "Homepage": "https://wayland.freedesktop.org",
diff --git a/src/compositor/extensions/extensions.pri b/src/compositor/extensions/extensions.pri
index d51a75b5d..577001a2d 100644
--- a/src/compositor/extensions/extensions.pri
+++ b/src/compositor/extensions/extensions.pri
@@ -9,7 +9,6 @@ WAYLANDSERVERSOURCES += \
     ../extensions/qt-key-unstable-v1.xml \
     ../extensions/qt-windowmanager.xml \
     ../3rdparty/protocol/text-input-unstable-v2.xml \
-    ../3rdparty/protocol/xdg-shell-unstable-v5.xml \
     ../3rdparty/protocol/xdg-shell-unstable-v6.xml \
     ../3rdparty/protocol/ivi-application.xml \
 
@@ -68,4 +67,6 @@ qtHaveModule(quick):contains(QT_CONFIG, opengl) {
 
 }
 
+include ($$PWD/pregenerated/xdg-shell-v5.pri)
+
 INCLUDEPATH += extensions
diff --git a/src/compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5.cpp b/src/compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5.cpp
new file mode 100644
index 000000000..77044d8e1
--- /dev/null
+++ b/src/compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5.cpp
@@ -0,0 +1,899 @@
+/*
+ * Copyright © 2008-2013 Kristian Høgsberg
+ * Copyright © 2013      Rafael Antognolli
+ * Copyright © 2013      Jasper St. Pierre
+ * Copyright © 2010-2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <QtWaylandCompositor/private/qwayland-server-xdg-shell-unstable-v5_p.h>
+
+QT_BEGIN_NAMESPACE
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
+
+namespace QtWaylandServer {
+    xdg_shell_v5::xdg_shell_v5(struct ::wl_client *client, int id, int version)
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+        init(client, id, version);
+    }
+
+    xdg_shell_v5::xdg_shell_v5(struct ::wl_display *display, int version)
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+        init(display, version);
+    }
+
+    xdg_shell_v5::xdg_shell_v5(struct ::wl_resource *resource)
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+        init(resource);
+    }
+
+    xdg_shell_v5::xdg_shell_v5()
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+    }
+
+    xdg_shell_v5::~xdg_shell_v5()
+    {
+        for (auto resource : qAsConst(m_resource_map))
+            wl_resource_set_implementation(resource->handle, nullptr, nullptr, nullptr);
+
+        if (m_global) {
+            wl_global_destroy(m_global);
+            wl_list_remove(&m_displayDestroyedListener.link);
+        }
+    }
+
+    void xdg_shell_v5::init(struct ::wl_client *client, int id, int version)
+    {
+        m_resource = bind(client, id, version);
+    }
+
+    void xdg_shell_v5::init(struct ::wl_resource *resource)
+    {
+        m_resource = bind(resource);
+    }
+
+    xdg_shell_v5::Resource *xdg_shell_v5::add(struct ::wl_client *client, int version)
+    {
+        Resource *resource = bind(client, 0, version);
+        m_resource_map.insert(client, resource);
+        return resource;
+    }
+
+    xdg_shell_v5::Resource *xdg_shell_v5::add(struct ::wl_client *client, int id, int version)
+    {
+        Resource *resource = bind(client, id, version);
+        m_resource_map.insert(client, resource);
+        return resource;
+    }
+
+    void xdg_shell_v5::init(struct ::wl_display *display, int version)
+    {
+        m_global = wl_global_create(display, &::xdg_shell_v5_interface, version, this, bind_func);
+        m_globalVersion = version;
+        m_displayDestroyedListener.notify = xdg_shell_v5::display_destroy_func;
+        m_displayDestroyedListener.parent = this;
+        wl_display_add_destroy_listener(display, &m_displayDestroyedListener);
+    }
+
+    const struct wl_interface *xdg_shell_v5::interface()
+    {
+        return &::xdg_shell_v5_interface;
+    }
+
+    xdg_shell_v5::Resource *xdg_shell_v5::xdg_shell_allocate()
+    {
+        return new Resource;
+    }
+
+    void xdg_shell_v5::xdg_shell_bind_resource(Resource *)
+    {
+    }
+
+    void xdg_shell_v5::xdg_shell_destroy_resource(Resource *)
+    {
+    }
+
+    void xdg_shell_v5::bind_func(struct ::wl_client *client, void *data, uint32_t version, uint32_t id)
+    {
+        xdg_shell_v5 *that = static_cast<xdg_shell_v5 *>(data);
+        that->add(client, id, qMin(that->m_globalVersion, version));
+    }
+
+    void xdg_shell_v5::display_destroy_func(struct ::wl_listener *listener, void *data)
+    {
+        Q_UNUSED(data);
+        xdg_shell_v5 *that = static_cast<xdg_shell_v5::DisplayDestroyedListener *>(listener)->parent;
+        that->m_global = nullptr;
+    }
+
+    void xdg_shell_v5::destroy_func(struct ::wl_resource *client_resource)
+    {
+        Resource *resource = Resource::fromResource(client_resource);
+        xdg_shell_v5 *that = resource->xdg_shell_object;
+        that->m_resource_map.remove(resource->client(), resource);
+        that->xdg_shell_destroy_resource(resource);
+        delete resource;
+#if !WAYLAND_VERSION_CHECK(1, 2, 0)
+        free(client_resource);
+#endif
+    }
+
+    xdg_shell_v5::Resource *xdg_shell_v5::bind(struct ::wl_client *client, uint32_t id, int version)
+    {
+        Q_ASSERT_X(!wl_client_get_object(client, id), "QWaylandObject bind", QStringLiteral("binding to object %1 more than once").arg(id).toLocal8Bit().constData());
+        struct ::wl_resource *handle = wl_resource_create(client, &::xdg_shell_v5_interface, version, id);
+        return bind(handle);
+    }
+
+    xdg_shell_v5::Resource *xdg_shell_v5::bind(struct ::wl_resource *handle)
+    {
+        Resource *resource = xdg_shell_allocate();
+        resource->xdg_shell_object = this;
+
+        wl_resource_set_implementation(handle, &m_xdg_shell_interface, resource, destroy_func);
+        resource->handle = handle;
+        xdg_shell_bind_resource(resource);
+        return resource;
+    }
+    xdg_shell_v5::Resource *xdg_shell_v5::Resource::fromResource(struct ::wl_resource *resource)
+    {
+        if (wl_resource_instance_of(resource, &::xdg_shell_v5_interface, &m_xdg_shell_interface))
+            return static_cast<Resource *>(resource->data);
+        return nullptr;
+    }
+
+    const struct ::xdg_shell_v5_interface xdg_shell_v5::m_xdg_shell_interface = {
+        xdg_shell_v5::handle_destroy,
+        xdg_shell_v5::handle_use_unstable_version,
+        xdg_shell_v5::handle_get_xdg_surface,
+        xdg_shell_v5::handle_get_xdg_popup,
+        xdg_shell_v5::handle_pong
+    };
+
+    void xdg_shell_v5::xdg_shell_destroy(Resource *)
+    {
+    }
+
+    void xdg_shell_v5::xdg_shell_use_unstable_version(Resource *, int32_t )
+    {
+    }
+
+    void xdg_shell_v5::xdg_shell_get_xdg_surface(Resource *, uint32_t, struct ::wl_resource *)
+    {
+    }
+
+    void xdg_shell_v5::xdg_shell_get_xdg_popup(Resource *, uint32_t, struct ::wl_resource *, struct ::wl_resource *, struct ::wl_resource *, uint32_t , int32_t , int32_t )
+    {
+    }
+
+    void xdg_shell_v5::xdg_shell_pong(Resource *, uint32_t )
+    {
+    }
+
+
+    void xdg_shell_v5::handle_destroy(
+        ::wl_client *client,
+        struct wl_resource *resource)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_shell_v5 *>(r->xdg_shell_object)->xdg_shell_destroy(
+            r);
+    }
+
+    void xdg_shell_v5::handle_use_unstable_version(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        int32_t version)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_shell_v5 *>(r->xdg_shell_object)->xdg_shell_use_unstable_version(
+            r,
+            version);
+    }
+
+    void xdg_shell_v5::handle_get_xdg_surface(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        uint32_t id,
+        struct ::wl_resource *surface)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_shell_v5 *>(r->xdg_shell_object)->xdg_shell_get_xdg_surface(
+            r,
+            id,
+            surface);
+    }
+
+    void xdg_shell_v5::handle_get_xdg_popup(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        uint32_t id,
+        struct ::wl_resource *surface,
+        struct ::wl_resource *parent,
+        struct ::wl_resource *seat,
+        uint32_t serial,
+        int32_t x,
+        int32_t y)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_shell_v5 *>(r->xdg_shell_object)->xdg_shell_get_xdg_popup(
+            r,
+            id,
+            surface,
+            parent,
+            seat,
+            serial,
+            x,
+            y);
+    }
+
+    void xdg_shell_v5::handle_pong(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        uint32_t serial)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_shell_v5 *>(r->xdg_shell_object)->xdg_shell_pong(
+            r,
+            serial);
+    }
+
+    void xdg_shell_v5::send_ping(uint32_t serial)
+    {
+        send_ping(
+            m_resource->handle,
+            serial);
+    }
+
+    void xdg_shell_v5::send_ping(struct ::wl_resource *resource, uint32_t serial)
+    {
+        xdg_shell_send_ping(
+            resource,
+            serial);
+    }
+
+
+    xdg_surface_v5::xdg_surface_v5(struct ::wl_client *client, int id, int version)
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+        init(client, id, version);
+    }
+
+    xdg_surface_v5::xdg_surface_v5(struct ::wl_display *display, int version)
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+        init(display, version);
+    }
+
+    xdg_surface_v5::xdg_surface_v5(struct ::wl_resource *resource)
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+        init(resource);
+    }
+
+    xdg_surface_v5::xdg_surface_v5()
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+    }
+
+    xdg_surface_v5::~xdg_surface_v5()
+    {
+        for (auto resource : qAsConst(m_resource_map))
+            wl_resource_set_implementation(resource->handle, nullptr, nullptr, nullptr);
+
+        if (m_global) {
+            wl_global_destroy(m_global);
+            wl_list_remove(&m_displayDestroyedListener.link);
+        }
+    }
+
+    void xdg_surface_v5::init(struct ::wl_client *client, int id, int version)
+    {
+        m_resource = bind(client, id, version);
+    }
+
+    void xdg_surface_v5::init(struct ::wl_resource *resource)
+    {
+        m_resource = bind(resource);
+    }
+
+    xdg_surface_v5::Resource *xdg_surface_v5::add(struct ::wl_client *client, int version)
+    {
+        Resource *resource = bind(client, 0, version);
+        m_resource_map.insert(client, resource);
+        return resource;
+    }
+
+    xdg_surface_v5::Resource *xdg_surface_v5::add(struct ::wl_client *client, int id, int version)
+    {
+        Resource *resource = bind(client, id, version);
+        m_resource_map.insert(client, resource);
+        return resource;
+    }
+
+    void xdg_surface_v5::init(struct ::wl_display *display, int version)
+    {
+        m_global = wl_global_create(display, &::xdg_surface_v5_interface, version, this, bind_func);
+        m_globalVersion = version;
+        m_displayDestroyedListener.notify = xdg_surface_v5::display_destroy_func;
+        m_displayDestroyedListener.parent = this;
+        wl_display_add_destroy_listener(display, &m_displayDestroyedListener);
+    }
+
+    const struct wl_interface *xdg_surface_v5::interface()
+    {
+        return &::xdg_surface_v5_interface;
+    }
+
+    xdg_surface_v5::Resource *xdg_surface_v5::xdg_surface_allocate()
+    {
+        return new Resource;
+    }
+
+    void xdg_surface_v5::xdg_surface_bind_resource(Resource *)
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_destroy_resource(Resource *)
+    {
+    }
+
+    void xdg_surface_v5::bind_func(struct ::wl_client *client, void *data, uint32_t version, uint32_t id)
+    {
+        xdg_surface_v5 *that = static_cast<xdg_surface_v5 *>(data);
+        that->add(client, id, qMin(that->m_globalVersion, version));
+    }
+
+    void xdg_surface_v5::display_destroy_func(struct ::wl_listener *listener, void *data)
+    {
+        Q_UNUSED(data);
+        xdg_surface_v5 *that = static_cast<xdg_surface_v5::DisplayDestroyedListener *>(listener)->parent;
+        that->m_global = nullptr;
+    }
+
+    void xdg_surface_v5::destroy_func(struct ::wl_resource *client_resource)
+    {
+        Resource *resource = Resource::fromResource(client_resource);
+        xdg_surface_v5 *that = resource->xdg_surface_object;
+        that->m_resource_map.remove(resource->client(), resource);
+        that->xdg_surface_destroy_resource(resource);
+        delete resource;
+#if !WAYLAND_VERSION_CHECK(1, 2, 0)
+        free(client_resource);
+#endif
+    }
+
+    xdg_surface_v5::Resource *xdg_surface_v5::bind(struct ::wl_client *client, uint32_t id, int version)
+    {
+        Q_ASSERT_X(!wl_client_get_object(client, id), "QWaylandObject bind", QStringLiteral("binding to object %1 more than once").arg(id).toLocal8Bit().constData());
+        struct ::wl_resource *handle = wl_resource_create(client, &::xdg_surface_v5_interface, version, id);
+        return bind(handle);
+    }
+
+    xdg_surface_v5::Resource *xdg_surface_v5::bind(struct ::wl_resource *handle)
+    {
+        Resource *resource = xdg_surface_allocate();
+        resource->xdg_surface_object = this;
+
+        wl_resource_set_implementation(handle, &m_xdg_surface_interface, resource, destroy_func);
+        resource->handle = handle;
+        xdg_surface_bind_resource(resource);
+        return resource;
+    }
+    xdg_surface_v5::Resource *xdg_surface_v5::Resource::fromResource(struct ::wl_resource *resource)
+    {
+        if (wl_resource_instance_of(resource, &::xdg_surface_v5_interface, &m_xdg_surface_interface))
+            return static_cast<Resource *>(resource->data);
+        return nullptr;
+    }
+
+    const struct ::xdg_surface_v5_interface xdg_surface_v5::m_xdg_surface_interface = {
+        xdg_surface_v5::handle_destroy,
+        xdg_surface_v5::handle_set_parent,
+        xdg_surface_v5::handle_set_title,
+        xdg_surface_v5::handle_set_app_id,
+        xdg_surface_v5::handle_show_window_menu,
+        xdg_surface_v5::handle_move,
+        xdg_surface_v5::handle_resize,
+        xdg_surface_v5::handle_ack_configure,
+        xdg_surface_v5::handle_set_window_geometry,
+        xdg_surface_v5::handle_set_maximized,
+        xdg_surface_v5::handle_unset_maximized,
+        xdg_surface_v5::handle_set_fullscreen,
+        xdg_surface_v5::handle_unset_fullscreen,
+        xdg_surface_v5::handle_set_minimized
+    };
+
+    void xdg_surface_v5::xdg_surface_destroy(Resource *)
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_set_parent(Resource *, struct ::wl_resource *)
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_set_title(Resource *, const QString &)
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_set_app_id(Resource *, const QString &)
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_show_window_menu(Resource *, struct ::wl_resource *, uint32_t , int32_t , int32_t )
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_move(Resource *, struct ::wl_resource *, uint32_t )
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_resize(Resource *, struct ::wl_resource *, uint32_t , uint32_t )
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_ack_configure(Resource *, uint32_t )
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_set_window_geometry(Resource *, int32_t , int32_t , int32_t , int32_t )
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_set_maximized(Resource *)
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_unset_maximized(Resource *)
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_set_fullscreen(Resource *, struct ::wl_resource *)
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_unset_fullscreen(Resource *)
+    {
+    }
+
+    void xdg_surface_v5::xdg_surface_set_minimized(Resource *)
+    {
+    }
+
+
+    void xdg_surface_v5::handle_destroy(
+        ::wl_client *client,
+        struct wl_resource *resource)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_destroy(
+            r);
+    }
+
+    void xdg_surface_v5::handle_set_parent(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        struct ::wl_resource *parent)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_set_parent(
+            r,
+            parent);
+    }
+
+    void xdg_surface_v5::handle_set_title(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        const char *title)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_set_title(
+            r,
+            QString::fromUtf8(title));
+    }
+
+    void xdg_surface_v5::handle_set_app_id(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        const char *app_id)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_set_app_id(
+            r,
+            QString::fromUtf8(app_id));
+    }
+
+    void xdg_surface_v5::handle_show_window_menu(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        struct ::wl_resource *seat,
+        uint32_t serial,
+        int32_t x,
+        int32_t y)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_show_window_menu(
+            r,
+            seat,
+            serial,
+            x,
+            y);
+    }
+
+    void xdg_surface_v5::handle_move(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        struct ::wl_resource *seat,
+        uint32_t serial)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_move(
+            r,
+            seat,
+            serial);
+    }
+
+    void xdg_surface_v5::handle_resize(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        struct ::wl_resource *seat,
+        uint32_t serial,
+        uint32_t edges)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_resize(
+            r,
+            seat,
+            serial,
+            edges);
+    }
+
+    void xdg_surface_v5::handle_ack_configure(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        uint32_t serial)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_ack_configure(
+            r,
+            serial);
+    }
+
+    void xdg_surface_v5::handle_set_window_geometry(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        int32_t x,
+        int32_t y,
+        int32_t width,
+        int32_t height)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_set_window_geometry(
+            r,
+            x,
+            y,
+            width,
+            height);
+    }
+
+    void xdg_surface_v5::handle_set_maximized(
+        ::wl_client *client,
+        struct wl_resource *resource)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_set_maximized(
+            r);
+    }
+
+    void xdg_surface_v5::handle_unset_maximized(
+        ::wl_client *client,
+        struct wl_resource *resource)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_unset_maximized(
+            r);
+    }
+
+    void xdg_surface_v5::handle_set_fullscreen(
+        ::wl_client *client,
+        struct wl_resource *resource,
+        struct ::wl_resource *output)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_set_fullscreen(
+            r,
+            output);
+    }
+
+    void xdg_surface_v5::handle_unset_fullscreen(
+        ::wl_client *client,
+        struct wl_resource *resource)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_unset_fullscreen(
+            r);
+    }
+
+    void xdg_surface_v5::handle_set_minimized(
+        ::wl_client *client,
+        struct wl_resource *resource)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_surface_v5 *>(r->xdg_surface_object)->xdg_surface_set_minimized(
+            r);
+    }
+
+    void xdg_surface_v5::send_configure(int32_t width, int32_t height, const QByteArray &states, uint32_t serial)
+    {
+        send_configure(
+            m_resource->handle,
+            width,
+            height,
+            states,
+            serial);
+    }
+
+    void xdg_surface_v5::send_configure(struct ::wl_resource *resource, int32_t width, int32_t height, const QByteArray &states, uint32_t serial)
+    {
+        struct wl_array states_data;
+        states_data.size = states.size();
+        states_data.data = static_cast<void *>(const_cast<char *>(states.constData()));
+        states_data.alloc = 0;
+
+        xdg_surface_send_configure(
+            resource,
+            width,
+            height,
+            &states_data,
+            serial);
+    }
+
+
+    void xdg_surface_v5::send_close()
+    {
+        send_close(
+            m_resource->handle);
+    }
+
+    void xdg_surface_v5::send_close(struct ::wl_resource *resource)
+    {
+        xdg_surface_send_close(
+            resource);
+    }
+
+
+    xdg_popup_v5::xdg_popup_v5(struct ::wl_client *client, int id, int version)
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+        init(client, id, version);
+    }
+
+    xdg_popup_v5::xdg_popup_v5(struct ::wl_display *display, int version)
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+        init(display, version);
+    }
+
+    xdg_popup_v5::xdg_popup_v5(struct ::wl_resource *resource)
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+        init(resource);
+    }
+
+    xdg_popup_v5::xdg_popup_v5()
+        : m_resource_map()
+        , m_resource(nullptr)
+        , m_global(nullptr)
+    {
+    }
+
+    xdg_popup_v5::~xdg_popup_v5()
+    {
+        for (auto resource : qAsConst(m_resource_map))
+            wl_resource_set_implementation(resource->handle, nullptr, nullptr, nullptr);
+
+        if (m_global) {
+            wl_global_destroy(m_global);
+            wl_list_remove(&m_displayDestroyedListener.link);
+        }
+    }
+
+    void xdg_popup_v5::init(struct ::wl_client *client, int id, int version)
+    {
+        m_resource = bind(client, id, version);
+    }
+
+    void xdg_popup_v5::init(struct ::wl_resource *resource)
+    {
+        m_resource = bind(resource);
+    }
+
+    xdg_popup_v5::Resource *xdg_popup_v5::add(struct ::wl_client *client, int version)
+    {
+        Resource *resource = bind(client, 0, version);
+        m_resource_map.insert(client, resource);
+        return resource;
+    }
+
+    xdg_popup_v5::Resource *xdg_popup_v5::add(struct ::wl_client *client, int id, int version)
+    {
+        Resource *resource = bind(client, id, version);
+        m_resource_map.insert(client, resource);
+        return resource;
+    }
+
+    void xdg_popup_v5::init(struct ::wl_display *display, int version)
+    {
+        m_global = wl_global_create(display, &::xdg_popup_v5_interface, version, this, bind_func);
+        m_globalVersion = version;
+        m_displayDestroyedListener.notify = xdg_popup_v5::display_destroy_func;
+        m_displayDestroyedListener.parent = this;
+        wl_display_add_destroy_listener(display, &m_displayDestroyedListener);
+    }
+
+    const struct wl_interface *xdg_popup_v5::interface()
+    {
+        return &::xdg_popup_v5_interface;
+    }
+
+    xdg_popup_v5::Resource *xdg_popup_v5::xdg_popup_allocate()
+    {
+        return new Resource;
+    }
+
+    void xdg_popup_v5::xdg_popup_bind_resource(Resource *)
+    {
+    }
+
+    void xdg_popup_v5::xdg_popup_destroy_resource(Resource *)
+    {
+    }
+
+    void xdg_popup_v5::bind_func(struct ::wl_client *client, void *data, uint32_t version, uint32_t id)
+    {
+        xdg_popup_v5 *that = static_cast<xdg_popup_v5 *>(data);
+        that->add(client, id, qMin(that->m_globalVersion, version));
+    }
+
+    void xdg_popup_v5::display_destroy_func(struct ::wl_listener *listener, void *data)
+    {
+        Q_UNUSED(data);
+        xdg_popup_v5 *that = static_cast<xdg_popup_v5::DisplayDestroyedListener *>(listener)->parent;
+        that->m_global = nullptr;
+    }
+
+    void xdg_popup_v5::destroy_func(struct ::wl_resource *client_resource)
+    {
+        Resource *resource = Resource::fromResource(client_resource);
+        xdg_popup_v5 *that = resource->xdg_popup_object;
+        that->m_resource_map.remove(resource->client(), resource);
+        that->xdg_popup_destroy_resource(resource);
+        delete resource;
+#if !WAYLAND_VERSION_CHECK(1, 2, 0)
+        free(client_resource);
+#endif
+    }
+
+    xdg_popup_v5::Resource *xdg_popup_v5::bind(struct ::wl_client *client, uint32_t id, int version)
+    {
+        Q_ASSERT_X(!wl_client_get_object(client, id), "QWaylandObject bind", QStringLiteral("binding to object %1 more than once").arg(id).toLocal8Bit().constData());
+        struct ::wl_resource *handle = wl_resource_create(client, &::xdg_popup_v5_interface, version, id);
+        return bind(handle);
+    }
+
+    xdg_popup_v5::Resource *xdg_popup_v5::bind(struct ::wl_resource *handle)
+    {
+        Resource *resource = xdg_popup_allocate();
+        resource->xdg_popup_object = this;
+
+        wl_resource_set_implementation(handle, &m_xdg_popup_interface, resource, destroy_func);
+        resource->handle = handle;
+        xdg_popup_bind_resource(resource);
+        return resource;
+    }
+    xdg_popup_v5::Resource *xdg_popup_v5::Resource::fromResource(struct ::wl_resource *resource)
+    {
+        if (wl_resource_instance_of(resource, &::xdg_popup_v5_interface, &m_xdg_popup_interface))
+            return static_cast<Resource *>(resource->data);
+        return nullptr;
+    }
+
+    const struct ::xdg_popup_v5_interface xdg_popup_v5::m_xdg_popup_interface = {
+        xdg_popup_v5::handle_destroy
+    };
+
+    void xdg_popup_v5::xdg_popup_destroy(Resource *)
+    {
+    }
+
+
+    void xdg_popup_v5::handle_destroy(
+        ::wl_client *client,
+        struct wl_resource *resource)
+    {
+        Q_UNUSED(client);
+        Resource *r = Resource::fromResource(resource);
+        static_cast<xdg_popup_v5 *>(r->xdg_popup_object)->xdg_popup_destroy(
+            r);
+    }
+
+    void xdg_popup_v5::send_popup_done()
+    {
+        send_popup_done(
+            m_resource->handle);
+    }
+
+    void xdg_popup_v5::send_popup_done(struct ::wl_resource *resource)
+    {
+        xdg_popup_send_popup_done(
+            resource);
+    }
+
+}
+
+QT_WARNING_POP
+QT_END_NAMESPACE
diff --git a/src/compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h b/src/compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h
new file mode 100644
index 000000000..dfd42535e
--- /dev/null
+++ b/src/compositor/extensions/pregenerated/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h
@@ -0,0 +1,436 @@
+/*
+ * Copyright © 2008-2013 Kristian Høgsberg
+ * Copyright © 2013      Rafael Antognolli
+ * Copyright © 2013      Jasper St. Pierre
+ * Copyright © 2010-2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef QT_WAYLAND_SERVER_XDG_SHELL_UNSTABLE_V5
+#define QT_WAYLAND_SERVER_XDG_SHELL_UNSTABLE_V5
+
+#include "wayland-server.h"
+#include <QtWaylandCompositor/private/wayland-xdg-shell-unstable-v5-server-protocol_p.h>
+#include <QByteArray>
+#include <QMultiMap>
+#include <QString>
+
+#ifndef WAYLAND_VERSION_CHECK
+#define WAYLAND_VERSION_CHECK(major, minor, micro) \
+    ((WAYLAND_VERSION_MAJOR > (major)) || \
+    (WAYLAND_VERSION_MAJOR == (major) && WAYLAND_VERSION_MINOR > (minor)) || \
+    (WAYLAND_VERSION_MAJOR == (major) && WAYLAND_VERSION_MINOR == (minor) && WAYLAND_VERSION_MICRO >= (micro)))
+#endif
+
+QT_BEGIN_NAMESPACE
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
+QT_WARNING_DISABLE_CLANG("-Wmissing-field-initializers")
+
+#if !defined(Q_WAYLAND_SERVER_XDG_SHELL_UNSTABLE_V5_EXPORT)
+#  if defined(QT_SHARED)
+#    define Q_WAYLAND_SERVER_XDG_SHELL_UNSTABLE_V5_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_WAYLAND_SERVER_XDG_SHELL_UNSTABLE_V5_EXPORT
+#  endif
+#endif
+
+namespace QtWaylandServer {
+    class Q_WAYLAND_SERVER_XDG_SHELL_UNSTABLE_V5_EXPORT xdg_shell_v5
+    {
+    public:
+        xdg_shell_v5(struct ::wl_client *client, int id, int version);
+        xdg_shell_v5(struct ::wl_display *display, int version);
+        xdg_shell_v5(struct ::wl_resource *resource);
+        xdg_shell_v5();
+
+        virtual ~xdg_shell_v5();
+
+        class Resource
+        {
+        public:
+            Resource() : xdg_shell_object(nullptr), handle(nullptr) {}
+            virtual ~Resource() {}
+
+            xdg_shell_v5 *xdg_shell_object;
+            struct ::wl_resource *handle;
+
+            struct ::wl_client *client() const { return handle->client; }
+            int version() const { return wl_resource_get_version(handle); }
+
+            static Resource *fromResource(struct ::wl_resource *resource);
+        };
+
+        void init(struct ::wl_client *client, int id, int version);
+        void init(struct ::wl_display *display, int version);
+        void init(struct ::wl_resource *resource);
+
+        Resource *add(struct ::wl_client *client, int version);
+        Resource *add(struct ::wl_client *client, int id, int version);
+        Resource *add(struct wl_list *resource_list, struct ::wl_client *client, int id, int version);
+
+        Resource *resource() { return m_resource; }
+        const Resource *resource() const { return m_resource; }
+
+        QMultiMap<struct ::wl_client*, Resource*> resourceMap() { return m_resource_map; }
+        const QMultiMap<struct ::wl_client*, Resource*> resourceMap() const { return m_resource_map; }
+
+        bool isGlobal() const { return m_global != nullptr; }
+        bool isResource() const { return m_resource != nullptr; }
+
+        static const struct ::wl_interface *interface();
+        static QByteArray interfaceName() { return interface()->name; }
+        static int interfaceVersion() { return interface()->version; }
+
+
+        enum version {
+            version_current = 5 // Always the latest version
+        };
+
+        enum error {
+            error_role = 0, // given wl_surface has another role
+            error_defunct_surfaces = 1, // xdg_shell was destroyed before children
+            error_not_the_topmost_popup = 2, // the client tried to map or destroy a non-topmost popup
+            error_invalid_popup_parent = 3 // the client specified an invalid popup parent surface
+        };
+
+        void send_ping(uint32_t serial);
+        void send_ping(struct ::wl_resource *resource, uint32_t serial);
+
+    protected:
+        virtual Resource *xdg_shell_allocate();
+
+        virtual void xdg_shell_bind_resource(Resource *resource);
+        virtual void xdg_shell_destroy_resource(Resource *resource);
+
+        virtual void xdg_shell_destroy(Resource *resource);
+        virtual void xdg_shell_use_unstable_version(Resource *resource, int32_t version);
+        virtual void xdg_shell_get_xdg_surface(Resource *resource, uint32_t id, struct ::wl_resource *surface);
+        virtual void xdg_shell_get_xdg_popup(Resource *resource, uint32_t id, struct ::wl_resource *surface, struct ::wl_resource *parent, struct ::wl_resource *seat, uint32_t serial, int32_t x, int32_t y);
+        virtual void xdg_shell_pong(Resource *resource, uint32_t serial);
+
+    private:
+        static void bind_func(struct ::wl_client *client, void *data, uint32_t version, uint32_t id);
+        static void destroy_func(struct ::wl_resource *client_resource);
+        static void display_destroy_func(struct ::wl_listener *listener, void *data);
+
+        Resource *bind(struct ::wl_client *client, uint32_t id, int version);
+        Resource *bind(struct ::wl_resource *handle);
+
+        static const struct ::xdg_shell_v5_interface m_xdg_shell_interface;
+
+        static void handle_destroy(
+            ::wl_client *client,
+            struct wl_resource *resource);
+        static void handle_use_unstable_version(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            int32_t version);
+        static void handle_get_xdg_surface(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            uint32_t id,
+            struct ::wl_resource *surface);
+        static void handle_get_xdg_popup(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            uint32_t id,
+            struct ::wl_resource *surface,
+            struct ::wl_resource *parent,
+            struct ::wl_resource *seat,
+            uint32_t serial,
+            int32_t x,
+            int32_t y);
+        static void handle_pong(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            uint32_t serial);
+
+        QMultiMap<struct ::wl_client*, Resource*> m_resource_map;
+        Resource *m_resource;
+        struct ::wl_global *m_global;
+        uint32_t m_globalVersion;
+        struct DisplayDestroyedListener : ::wl_listener {
+            xdg_shell_v5 *parent;
+        };
+        DisplayDestroyedListener m_displayDestroyedListener;
+    };
+
+    class Q_WAYLAND_SERVER_XDG_SHELL_UNSTABLE_V5_EXPORT xdg_surface_v5
+    {
+    public:
+        xdg_surface_v5(struct ::wl_client *client, int id, int version);
+        xdg_surface_v5(struct ::wl_display *display, int version);
+        xdg_surface_v5(struct ::wl_resource *resource);
+        xdg_surface_v5();
+
+        virtual ~xdg_surface_v5();
+
+        class Resource
+        {
+        public:
+            Resource() : xdg_surface_object(nullptr), handle(nullptr) {}
+            virtual ~Resource() {}
+
+            xdg_surface_v5 *xdg_surface_object;
+            struct ::wl_resource *handle;
+
+            struct ::wl_client *client() const { return handle->client; }
+            int version() const { return wl_resource_get_version(handle); }
+
+            static Resource *fromResource(struct ::wl_resource *resource);
+        };
+
+        void init(struct ::wl_client *client, int id, int version);
+        void init(struct ::wl_display *display, int version);
+        void init(struct ::wl_resource *resource);
+
+        Resource *add(struct ::wl_client *client, int version);
+        Resource *add(struct ::wl_client *client, int id, int version);
+        Resource *add(struct wl_list *resource_list, struct ::wl_client *client, int id, int version);
+
+        Resource *resource() { return m_resource; }
+        const Resource *resource() const { return m_resource; }
+
+        QMultiMap<struct ::wl_client*, Resource*> resourceMap() { return m_resource_map; }
+        const QMultiMap<struct ::wl_client*, Resource*> resourceMap() const { return m_resource_map; }
+
+        bool isGlobal() const { return m_global != nullptr; }
+        bool isResource() const { return m_resource != nullptr; }
+
+        static const struct ::wl_interface *interface();
+        static QByteArray interfaceName() { return interface()->name; }
+        static int interfaceVersion() { return interface()->version; }
+
+
+        enum resize_edge {
+            resize_edge_none = 0,
+            resize_edge_top = 1,
+            resize_edge_bottom = 2,
+            resize_edge_left = 4,
+            resize_edge_top_left = 5,
+            resize_edge_bottom_left = 6,
+            resize_edge_right = 8,
+            resize_edge_top_right = 9,
+            resize_edge_bottom_right = 10
+        };
+
+        enum state {
+            state_maximized = 1, // the surface is maximized
+            state_fullscreen = 2, // the surface is fullscreen
+            state_resizing = 3,
+            state_activated = 4
+        };
+
+        void send_configure(int32_t width, int32_t height, const QByteArray &states, uint32_t serial);
+        void send_configure(struct ::wl_resource *resource, int32_t width, int32_t height, const QByteArray &states, uint32_t serial);
+        void send_close();
+        void send_close(struct ::wl_resource *resource);
+
+    protected:
+        virtual Resource *xdg_surface_allocate();
+
+        virtual void xdg_surface_bind_resource(Resource *resource);
+        virtual void xdg_surface_destroy_resource(Resource *resource);
+
+        virtual void xdg_surface_destroy(Resource *resource);
+        virtual void xdg_surface_set_parent(Resource *resource, struct ::wl_resource *parent);
+        virtual void xdg_surface_set_title(Resource *resource, const QString &title);
+        virtual void xdg_surface_set_app_id(Resource *resource, const QString &app_id);
+        virtual void xdg_surface_show_window_menu(Resource *resource, struct ::wl_resource *seat, uint32_t serial, int32_t x, int32_t y);
+        virtual void xdg_surface_move(Resource *resource, struct ::wl_resource *seat, uint32_t serial);
+        virtual void xdg_surface_resize(Resource *resource, struct ::wl_resource *seat, uint32_t serial, uint32_t edges);
+        virtual void xdg_surface_ack_configure(Resource *resource, uint32_t serial);
+        virtual void xdg_surface_set_window_geometry(Resource *resource, int32_t x, int32_t y, int32_t width, int32_t height);
+        virtual void xdg_surface_set_maximized(Resource *resource);
+        virtual void xdg_surface_unset_maximized(Resource *resource);
+        virtual void xdg_surface_set_fullscreen(Resource *resource, struct ::wl_resource *output);
+        virtual void xdg_surface_unset_fullscreen(Resource *resource);
+        virtual void xdg_surface_set_minimized(Resource *resource);
+
+    private:
+        static void bind_func(struct ::wl_client *client, void *data, uint32_t version, uint32_t id);
+        static void destroy_func(struct ::wl_resource *client_resource);
+        static void display_destroy_func(struct ::wl_listener *listener, void *data);
+
+        Resource *bind(struct ::wl_client *client, uint32_t id, int version);
+        Resource *bind(struct ::wl_resource *handle);
+
+        static const struct ::xdg_surface_v5_interface m_xdg_surface_interface;
+
+        static void handle_destroy(
+            ::wl_client *client,
+            struct wl_resource *resource);
+        static void handle_set_parent(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            struct ::wl_resource *parent);
+        static void handle_set_title(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            const char *title);
+        static void handle_set_app_id(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            const char *app_id);
+        static void handle_show_window_menu(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            struct ::wl_resource *seat,
+            uint32_t serial,
+            int32_t x,
+            int32_t y);
+        static void handle_move(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            struct ::wl_resource *seat,
+            uint32_t serial);
+        static void handle_resize(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            struct ::wl_resource *seat,
+            uint32_t serial,
+            uint32_t edges);
+        static void handle_ack_configure(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            uint32_t serial);
+        static void handle_set_window_geometry(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            int32_t x,
+            int32_t y,
+            int32_t width,
+            int32_t height);
+        static void handle_set_maximized(
+            ::wl_client *client,
+            struct wl_resource *resource);
+        static void handle_unset_maximized(
+            ::wl_client *client,
+            struct wl_resource *resource);
+        static void handle_set_fullscreen(
+            ::wl_client *client,
+            struct wl_resource *resource,
+            struct ::wl_resource *output);
+        static void handle_unset_fullscreen(
+            ::wl_client *client,
+            struct wl_resource *resource);
+        static void handle_set_minimized(
+            ::wl_client *client,
+            struct wl_resource *resource);
+
+        QMultiMap<struct ::wl_client*, Resource*> m_resource_map;
+        Resource *m_resource;
+        struct ::wl_global *m_global;
+        uint32_t m_globalVersion;
+        struct DisplayDestroyedListener : ::wl_listener {
+            xdg_surface_v5 *parent;
+        };
+        DisplayDestroyedListener m_displayDestroyedListener;
+    };
+
+    class Q_WAYLAND_SERVER_XDG_SHELL_UNSTABLE_V5_EXPORT xdg_popup_v5
+    {
+    public:
+        xdg_popup_v5(struct ::wl_client *client, int id, int version);
+        xdg_popup_v5(struct ::wl_display *display, int version);
+        xdg_popup_v5(struct ::wl_resource *resource);
+        xdg_popup_v5();
+
+        virtual ~xdg_popup_v5();
+
+        class Resource
+        {
+        public:
+            Resource() : xdg_popup_object(nullptr), handle(nullptr) {}
+            virtual ~Resource() {}
+
+            xdg_popup_v5 *xdg_popup_object;
+            struct ::wl_resource *handle;
+
+            struct ::wl_client *client() const { return handle->client; }
+            int version() const { return wl_resource_get_version(handle); }
+
+            static Resource *fromResource(struct ::wl_resource *resource);
+        };
+
+        void init(struct ::wl_client *client, int id, int version);
+        void init(struct ::wl_display *display, int version);
+        void init(struct ::wl_resource *resource);
+
+        Resource *add(struct ::wl_client *client, int version);
+        Resource *add(struct ::wl_client *client, int id, int version);
+        Resource *add(struct wl_list *resource_list, struct ::wl_client *client, int id, int version);
+
+        Resource *resource() { return m_resource; }
+        const Resource *resource() const { return m_resource; }
+
+        QMultiMap<struct ::wl_client*, Resource*> resourceMap() { return m_resource_map; }
+        const QMultiMap<struct ::wl_client*, Resource*> resourceMap() const { return m_resource_map; }
+
+        bool isGlobal() const { return m_global != nullptr; }
+        bool isResource() const { return m_resource != nullptr; }
+
+        static const struct ::wl_interface *interface();
+        static QByteArray interfaceName() { return interface()->name; }
+        static int interfaceVersion() { return interface()->version; }
+
+
+        void send_popup_done();
+        void send_popup_done(struct ::wl_resource *resource);
+
+    protected:
+        virtual Resource *xdg_popup_allocate();
+
+        virtual void xdg_popup_bind_resource(Resource *resource);
+        virtual void xdg_popup_destroy_resource(Resource *resource);
+
+        virtual void xdg_popup_destroy(Resource *resource);
+
+    private:
+        static void bind_func(struct ::wl_client *client, void *data, uint32_t version, uint32_t id);
+        static void destroy_func(struct ::wl_resource *client_resource);
+        static void display_destroy_func(struct ::wl_listener *listener, void *data);
+
+        Resource *bind(struct ::wl_client *client, uint32_t id, int version);
+        Resource *bind(struct ::wl_resource *handle);
+
+        static const struct ::xdg_popup_v5_interface m_xdg_popup_interface;
+
+        static void handle_destroy(
+            ::wl_client *client,
+            struct wl_resource *resource);
+
+        QMultiMap<struct ::wl_client*, Resource*> m_resource_map;
+        Resource *m_resource;
+        struct ::wl_global *m_global;
+        uint32_t m_globalVersion;
+        struct DisplayDestroyedListener : ::wl_listener {
+            xdg_popup_v5 *parent;
+        };
+        DisplayDestroyedListener m_displayDestroyedListener;
+    };
+}
+
+QT_WARNING_POP
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/compositor/extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-protocol.c b/src/compositor/extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-protocol.c
new file mode 100644
index 000000000..e2781c994
--- /dev/null
+++ b/src/compositor/extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-protocol.c
@@ -0,0 +1,126 @@
+/* Generated by wayland-scanner 1.15.92 */
+// Hand edited to resolve conflicts with xdg-shell stable
+
+/*
+ * Copyright © 2008-2013 Kristian Høgsberg
+ * Copyright © 2013      Rafael Antognolli
+ * Copyright © 2013      Jasper St. Pierre
+ * Copyright © 2010-2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <stdint.h>
+#include "wayland-util.h"
+
+extern const struct wl_interface wl_output_interface;
+extern const struct wl_interface wl_seat_interface;
+extern const struct wl_interface wl_surface_interface;
+extern const struct wl_interface xdg_popup_v5_interface;
+extern const struct wl_interface xdg_surface_v5_interface;
+
+static const struct wl_interface *types[] = {
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	&xdg_surface_v5_interface,
+	&wl_surface_interface,
+	&xdg_popup_v5_interface,
+	&wl_surface_interface,
+	&wl_surface_interface,
+	&wl_seat_interface,
+	NULL,
+	NULL,
+	NULL,
+	&xdg_surface_v5_interface,
+	&wl_seat_interface,
+	NULL,
+	NULL,
+	NULL,
+	&wl_seat_interface,
+	NULL,
+	&wl_seat_interface,
+	NULL,
+	NULL,
+	&wl_output_interface,
+};
+
+static const struct wl_message xdg_shell_requests[] = {
+	{ "destroy", "", types + 0 },
+	{ "use_unstable_version", "i", types + 0 },
+	{ "get_xdg_surface", "no", types + 4 },
+	{ "get_xdg_popup", "nooouii", types + 6 },
+	{ "pong", "u", types + 0 },
+};
+
+static const struct wl_message xdg_shell_events[] = {
+	{ "ping", "u", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface xdg_shell_v5_interface = {
+	"xdg_shell", 1,
+	5, xdg_shell_requests,
+	1, xdg_shell_events,
+};
+
+static const struct wl_message xdg_surface_requests[] = {
+	{ "destroy", "", types + 0 },
+	{ "set_parent", "?o", types + 13 },
+	{ "set_title", "s", types + 0 },
+	{ "set_app_id", "s", types + 0 },
+	{ "show_window_menu", "ouii", types + 14 },
+	{ "move", "ou", types + 18 },
+	{ "resize", "ouu", types + 20 },
+	{ "ack_configure", "u", types + 0 },
+	{ "set_window_geometry", "iiii", types + 0 },
+	{ "set_maximized", "", types + 0 },
+	{ "unset_maximized", "", types + 0 },
+	{ "set_fullscreen", "?o", types + 23 },
+	{ "unset_fullscreen", "", types + 0 },
+	{ "set_minimized", "", types + 0 },
+};
+
+static const struct wl_message xdg_surface_events[] = {
+	{ "configure", "iiau", types + 0 },
+	{ "close", "", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface xdg_surface_v5_interface = {
+	"xdg_surface", 1,
+	14, xdg_surface_requests,
+	2, xdg_surface_events,
+};
+
+static const struct wl_message xdg_popup_requests[] = {
+	{ "destroy", "", types + 0 },
+};
+
+static const struct wl_message xdg_popup_events[] = {
+	{ "popup_done", "", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface xdg_popup_v5_interface = {
+	"xdg_popup", 1,
+	1, xdg_popup_requests,
+	1, xdg_popup_events,
+};
+
diff --git a/src/compositor/extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-server-protocol_p.h b/src/compositor/extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-server-protocol_p.h
new file mode 100644
index 000000000..b979f048c
--- /dev/null
+++ b/src/compositor/extensions/pregenerated/3rdparty/wayland-xdg-shell-unstable-v5-server-protocol_p.h
@@ -0,0 +1,905 @@
+/* Generated by wayland-scanner 1.15.92 */
+// Hand edited to resolve conflicts with xdg-shell stable
+
+#ifndef XDG_SHELL_UNSTABLE_V5_SERVER_PROTOCOL_H
+#define XDG_SHELL_UNSTABLE_V5_SERVER_PROTOCOL_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include "wayland-server.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct wl_client;
+struct wl_resource;
+
+/**
+ * @page page_xdg_shell_unstable_v5 The xdg_shell_unstable_v5 protocol
+ * @section page_ifaces_xdg_shell_unstable_v5 Interfaces
+ * - @subpage page_iface_xdg_shell - create desktop-style surfaces
+ * - @subpage page_iface_xdg_surface - A desktop window
+ * - @subpage page_iface_xdg_popup - short-lived, popup surfaces for menus
+ * @section page_copyright_xdg_shell_unstable_v5 Copyright
+ * <pre>
+ *
+ * Copyright © 2008-2013 Kristian Høgsberg
+ * Copyright © 2013      Rafael Antognolli
+ * Copyright © 2013      Jasper St. Pierre
+ * Copyright © 2010-2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * </pre>
+ */
+struct wl_output;
+struct wl_seat;
+struct wl_surface;
+struct xdg_popup;
+struct xdg_shell;
+struct xdg_surface;
+
+/**
+ * @page page_iface_xdg_shell xdg_shell
+ * @section page_iface_xdg_shell_desc Description
+ *
+ * xdg_shell allows clients to turn a wl_surface into a "real window"
+ * which can be dragged, resized, stacked, and moved around by the
+ * user. Everything about this interface is suited towards traditional
+ * desktop environments.
+ * @section page_iface_xdg_shell_api API
+ * See @ref iface_xdg_shell.
+ */
+/**
+ * @defgroup iface_xdg_shell The xdg_shell interface
+ *
+ * xdg_shell allows clients to turn a wl_surface into a "real window"
+ * which can be dragged, resized, stacked, and moved around by the
+ * user. Everything about this interface is suited towards traditional
+ * desktop environments.
+ */
+extern const struct wl_interface xdg_shell_v5_interface;
+/**
+ * @page page_iface_xdg_surface xdg_surface
+ * @section page_iface_xdg_surface_desc Description
+ *
+ * An interface that may be implemented by a wl_surface, for
+ * implementations that provide a desktop-style user interface.
+ *
+ * It provides requests to treat surfaces like windows, allowing to set
+ * properties like maximized, fullscreen, minimized, and to move and resize
+ * them, and associate metadata like title and app id.
+ *
+ * The client must call wl_surface.commit on the corresponding wl_surface
+ * for the xdg_surface state to take effect. Prior to committing the new
+ * state, it can set up initial configuration, such as maximizing or setting
+ * a window geometry.
+ *
+ * Even without attaching a buffer the compositor must respond to initial
+ * committed configuration, for instance sending a configure event with
+ * expected window geometry if the client maximized its surface during
+ * initialization.
+ *
+ * For a surface to be mapped by the compositor the client must have
+ * committed both an xdg_surface state and a buffer.
+ * @section page_iface_xdg_surface_api API
+ * See @ref iface_xdg_surface.
+ */
+/**
+ * @defgroup iface_xdg_surface The xdg_surface interface
+ *
+ * An interface that may be implemented by a wl_surface, for
+ * implementations that provide a desktop-style user interface.
+ *
+ * It provides requests to treat surfaces like windows, allowing to set
+ * properties like maximized, fullscreen, minimized, and to move and resize
+ * them, and associate metadata like title and app id.
+ *
+ * The client must call wl_surface.commit on the corresponding wl_surface
+ * for the xdg_surface state to take effect. Prior to committing the new
+ * state, it can set up initial configuration, such as maximizing or setting
+ * a window geometry.
+ *
+ * Even without attaching a buffer the compositor must respond to initial
+ * committed configuration, for instance sending a configure event with
+ * expected window geometry if the client maximized its surface during
+ * initialization.
+ *
+ * For a surface to be mapped by the compositor the client must have
+ * committed both an xdg_surface state and a buffer.
+ */
+extern const struct wl_interface xdg_surface_v5_interface;
+/**
+ * @page page_iface_xdg_popup xdg_popup
+ * @section page_iface_xdg_popup_desc Description
+ *
+ * A popup surface is a short-lived, temporary surface that can be
+ * used to implement menus. It takes an explicit grab on the surface
+ * that will be dismissed when the user dismisses the popup. This can
+ * be done by the user clicking outside the surface, using the keyboard,
+ * or even locking the screen through closing the lid or a timeout.
+ *
+ * When the popup is dismissed, a popup_done event will be sent out,
+ * and at the same time the surface will be unmapped. The xdg_popup
+ * object is now inert and cannot be reactivated, so clients should
+ * destroy it. Explicitly destroying the xdg_popup object will also
+ * dismiss the popup and unmap the surface.
+ *
+ * Clients will receive events for all their surfaces during this
+ * grab (which is an "owner-events" grab in X11 parlance). This is
+ * done so that users can navigate through submenus and other
+ * "nested" popup windows without having to dismiss the topmost
+ * popup.
+ *
+ * Clients that want to dismiss the popup when another surface of
+ * their own is clicked should dismiss the popup using the destroy
+ * request.
+ *
+ * The parent surface must have either an xdg_surface or xdg_popup
+ * role.
+ *
+ * Specifying an xdg_popup for the parent means that the popups are
+ * nested, with this popup now being the topmost popup. Nested
+ * popups must be destroyed in the reverse order they were created
+ * in, e.g. the only popup you are allowed to destroy at all times
+ * is the topmost one.
+ *
+ * If there is an existing popup when creating a new popup, the
+ * parent must be the current topmost popup.
+ *
+ * A parent surface must be mapped before the new popup is mapped.
+ *
+ * When compositors choose to dismiss a popup, they will likely
+ * dismiss every nested popup as well. When a compositor dismisses
+ * popups, it will follow the same dismissing order as required
+ * from the client.
+ *
+ * The x and y arguments passed when creating the popup object specify
+ * where the top left of the popup should be placed, relative to the
+ * local surface coordinates of the parent surface. See
+ * xdg_shell.get_xdg_popup.
+ *
+ * The client must call wl_surface.commit on the corresponding wl_surface
+ * for the xdg_popup state to take effect.
+ *
+ * For a surface to be mapped by the compositor the client must have
+ * committed both the xdg_popup state and a buffer.
+ * @section page_iface_xdg_popup_api API
+ * See @ref iface_xdg_popup.
+ */
+/**
+ * @defgroup iface_xdg_popup The xdg_popup interface
+ *
+ * A popup surface is a short-lived, temporary surface that can be
+ * used to implement menus. It takes an explicit grab on the surface
+ * that will be dismissed when the user dismisses the popup. This can
+ * be done by the user clicking outside the surface, using the keyboard,
+ * or even locking the screen through closing the lid or a timeout.
+ *
+ * When the popup is dismissed, a popup_done event will be sent out,
+ * and at the same time the surface will be unmapped. The xdg_popup
+ * object is now inert and cannot be reactivated, so clients should
+ * destroy it. Explicitly destroying the xdg_popup object will also
+ * dismiss the popup and unmap the surface.
+ *
+ * Clients will receive events for all their surfaces during this
+ * grab (which is an "owner-events" grab in X11 parlance). This is
+ * done so that users can navigate through submenus and other
+ * "nested" popup windows without having to dismiss the topmost
+ * popup.
+ *
+ * Clients that want to dismiss the popup when another surface of
+ * their own is clicked should dismiss the popup using the destroy
+ * request.
+ *
+ * The parent surface must have either an xdg_surface or xdg_popup
+ * role.
+ *
+ * Specifying an xdg_popup for the parent means that the popups are
+ * nested, with this popup now being the topmost popup. Nested
+ * popups must be destroyed in the reverse order they were created
+ * in, e.g. the only popup you are allowed to destroy at all times
+ * is the topmost one.
+ *
+ * If there is an existing popup when creating a new popup, the
+ * parent must be the current topmost popup.
+ *
+ * A parent surface must be mapped before the new popup is mapped.
+ *
+ * When compositors choose to dismiss a popup, they will likely
+ * dismiss every nested popup as well. When a compositor dismisses
+ * popups, it will follow the same dismissing order as required
+ * from the client.
+ *
+ * The x and y arguments passed when creating the popup object specify
+ * where the top left of the popup should be placed, relative to the
+ * local surface coordinates of the parent surface. See
+ * xdg_shell.get_xdg_popup.
+ *
+ * The client must call wl_surface.commit on the corresponding wl_surface
+ * for the xdg_popup state to take effect.
+ *
+ * For a surface to be mapped by the compositor the client must have
+ * committed both the xdg_popup state and a buffer.
+ */
+extern const struct wl_interface xdg_popup_v5_interface;
+
+#ifndef XDG_SHELL_VERSION_ENUM
+#define XDG_SHELL_VERSION_ENUM
+/**
+ * @ingroup iface_xdg_shell
+ * latest protocol version
+ *
+ * The 'current' member of this enum gives the version of the
+ * protocol.  Implementations can compare this to the version
+ * they implement using static_assert to ensure the protocol and
+ * implementation versions match.
+ */
+enum xdg_shell_version {
+	/**
+	 * Always the latest version
+	 */
+	XDG_SHELL_VERSION_CURRENT = 5,
+};
+#endif /* XDG_SHELL_VERSION_ENUM */
+
+#ifndef XDG_SHELL_ERROR_ENUM
+#define XDG_SHELL_ERROR_ENUM
+enum xdg_shell_error {
+	/**
+	 * given wl_surface has another role
+	 */
+	XDG_SHELL_ERROR_ROLE = 0,
+	/**
+	 * xdg_shell was destroyed before children
+	 */
+	XDG_SHELL_ERROR_DEFUNCT_SURFACES = 1,
+	/**
+	 * the client tried to map or destroy a non-topmost popup
+	 */
+	XDG_SHELL_ERROR_NOT_THE_TOPMOST_POPUP = 2,
+	/**
+	 * the client specified an invalid popup parent surface
+	 */
+	XDG_SHELL_ERROR_INVALID_POPUP_PARENT = 3,
+};
+#endif /* XDG_SHELL_ERROR_ENUM */
+
+/**
+ * @ingroup iface_xdg_shell
+ * @struct xdg_shell_v5_interface
+ */
+struct xdg_shell_v5_interface {
+	/**
+	 * destroy xdg_shell
+	 *
+	 * Destroy this xdg_shell object.
+	 *
+	 * Destroying a bound xdg_shell object while there are surfaces
+	 * still alive created by this xdg_shell object instance is illegal
+	 * and will result in a protocol error.
+	 */
+	void (*destroy)(struct wl_client *client,
+			struct wl_resource *resource);
+	/**
+	 * enable use of this unstable version
+	 *
+	 * Negotiate the unstable version of the interface. This
+	 * mechanism is in place to ensure client and server agree on the
+	 * unstable versions of the protocol that they speak or exit
+	 * cleanly if they don't agree. This request will go away once the
+	 * xdg-shell protocol is stable.
+	 */
+	void (*use_unstable_version)(struct wl_client *client,
+				     struct wl_resource *resource,
+				     int32_t version);
+	/**
+	 * create a shell surface from a surface
+	 *
+	 * This creates an xdg_surface for the given surface and gives it
+	 * the xdg_surface role. A wl_surface can only be given an
+	 * xdg_surface role once. If get_xdg_surface is called with a
+	 * wl_surface that already has an active xdg_surface associated
+	 * with it, or if it had any other role, an error is raised.
+	 *
+	 * See the documentation of xdg_surface for more details about what
+	 * an xdg_surface is and how it is used.
+	 */
+	void (*get_xdg_surface)(struct wl_client *client,
+				struct wl_resource *resource,
+				uint32_t id,
+				struct wl_resource *surface);
+	/**
+	 * create a popup for a surface
+	 *
+	 * This creates an xdg_popup for the given surface and gives it
+	 * the xdg_popup role. A wl_surface can only be given an xdg_popup
+	 * role once. If get_xdg_popup is called with a wl_surface that
+	 * already has an active xdg_popup associated with it, or if it had
+	 * any other role, an error is raised.
+	 *
+	 * This request must be used in response to some sort of user
+	 * action like a button press, key press, or touch down event.
+	 *
+	 * See the documentation of xdg_popup for more details about what
+	 * an xdg_popup is and how it is used.
+	 * @param seat the wl_seat of the user event
+	 * @param serial the serial of the user event
+	 */
+	void (*get_xdg_popup)(struct wl_client *client,
+			      struct wl_resource *resource,
+			      uint32_t id,
+			      struct wl_resource *surface,
+			      struct wl_resource *parent,
+			      struct wl_resource *seat,
+			      uint32_t serial,
+			      int32_t x,
+			      int32_t y);
+	/**
+	 * respond to a ping event
+	 *
+	 * A client must respond to a ping event with a pong request or
+	 * the client may be deemed unresponsive.
+	 * @param serial serial of the ping event
+	 */
+	void (*pong)(struct wl_client *client,
+		     struct wl_resource *resource,
+		     uint32_t serial);
+};
+
+#define XDG_SHELL_PING 0
+
+/**
+ * @ingroup iface_xdg_shell
+ */
+#define XDG_SHELL_PING_SINCE_VERSION 1
+
+/**
+ * @ingroup iface_xdg_shell
+ */
+#define XDG_SHELL_DESTROY_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_shell
+ */
+#define XDG_SHELL_USE_UNSTABLE_VERSION_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_shell
+ */
+#define XDG_SHELL_GET_XDG_SURFACE_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_shell
+ */
+#define XDG_SHELL_GET_XDG_POPUP_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_shell
+ */
+#define XDG_SHELL_PONG_SINCE_VERSION 1
+
+/**
+ * @ingroup iface_xdg_shell
+ * Sends an ping event to the client owning the resource.
+ * @param resource_ The client's resource
+ * @param serial pass this to the pong request
+ */
+static inline void
+xdg_shell_send_ping(struct wl_resource *resource_, uint32_t serial)
+{
+	wl_resource_post_event(resource_, XDG_SHELL_PING, serial);
+}
+
+#ifndef XDG_SURFACE_RESIZE_EDGE_ENUM
+#define XDG_SURFACE_RESIZE_EDGE_ENUM
+/**
+ * @ingroup iface_xdg_surface
+ * edge values for resizing
+ *
+ * These values are used to indicate which edge of a surface
+ * is being dragged in a resize operation.
+ */
+enum xdg_surface_resize_edge {
+	XDG_SURFACE_RESIZE_EDGE_NONE = 0,
+	XDG_SURFACE_RESIZE_EDGE_TOP = 1,
+	XDG_SURFACE_RESIZE_EDGE_BOTTOM = 2,
+	XDG_SURFACE_RESIZE_EDGE_LEFT = 4,
+	XDG_SURFACE_RESIZE_EDGE_TOP_LEFT = 5,
+	XDG_SURFACE_RESIZE_EDGE_BOTTOM_LEFT = 6,
+	XDG_SURFACE_RESIZE_EDGE_RIGHT = 8,
+	XDG_SURFACE_RESIZE_EDGE_TOP_RIGHT = 9,
+	XDG_SURFACE_RESIZE_EDGE_BOTTOM_RIGHT = 10,
+};
+#endif /* XDG_SURFACE_RESIZE_EDGE_ENUM */
+
+#ifndef XDG_SURFACE_STATE_ENUM
+#define XDG_SURFACE_STATE_ENUM
+/**
+ * @ingroup iface_xdg_surface
+ * types of state on the surface
+ *
+ * The different state values used on the surface. This is designed for
+ * state values like maximized, fullscreen. It is paired with the
+ * configure event to ensure that both the client and the compositor
+ * setting the state can be synchronized.
+ *
+ * States set in this way are double-buffered. They will get applied on
+ * the next commit.
+ *
+ * Desktop environments may extend this enum by taking up a range of
+ * values and documenting the range they chose in this description.
+ * They are not required to document the values for the range that they
+ * chose. Ideally, any good extensions from a desktop environment should
+ * make its way into standardization into this enum.
+ *
+ * The current reserved ranges are:
+ *
+ * 0x0000 - 0x0FFF: xdg-shell core values, documented below.
+ * 0x1000 - 0x1FFF: GNOME
+ */
+enum xdg_surface_state {
+	/**
+	 * the surface is maximized
+	 */
+	XDG_SURFACE_STATE_MAXIMIZED = 1,
+	/**
+	 * the surface is fullscreen
+	 */
+	XDG_SURFACE_STATE_FULLSCREEN = 2,
+	XDG_SURFACE_STATE_RESIZING = 3,
+	XDG_SURFACE_STATE_ACTIVATED = 4,
+};
+#endif /* XDG_SURFACE_STATE_ENUM */
+
+/**
+ * @ingroup iface_xdg_surface
+ * @struct xdg_surface_v5_interface
+ */
+struct xdg_surface_v5_interface {
+	/**
+	 * Destroy the xdg_surface
+	 *
+	 * Unmap and destroy the window. The window will be effectively
+	 * hidden from the user's point of view, and all state like
+	 * maximization, fullscreen, and so on, will be lost.
+	 */
+	void (*destroy)(struct wl_client *client,
+			struct wl_resource *resource);
+	/**
+	 * set the parent of this surface
+	 *
+	 * Set the "parent" of this surface. This window should be
+	 * stacked above a parent. The parent surface must be mapped as
+	 * long as this surface is mapped.
+	 *
+	 * Parent windows should be set on dialogs, toolboxes, or other
+	 * "auxiliary" surfaces, so that the parent is raised when the
+	 * dialog is raised.
+	 */
+	void (*set_parent)(struct wl_client *client,
+			   struct wl_resource *resource,
+			   struct wl_resource *parent);
+	/**
+	 * set surface title
+	 *
+	 * Set a short title for the surface.
+	 *
+	 * This string may be used to identify the surface in a task bar,
+	 * window list, or other user interface elements provided by the
+	 * compositor.
+	 *
+	 * The string must be encoded in UTF-8.
+	 */
+	void (*set_title)(struct wl_client *client,
+			  struct wl_resource *resource,
+			  const char *title);
+	/**
+	 * set application ID
+	 *
+	 * Set an application identifier for the surface.
+	 *
+	 * The app ID identifies the general class of applications to which
+	 * the surface belongs. The compositor can use this to group
+	 * multiple surfaces together, or to determine how to launch a new
+	 * application.
+	 *
+	 * For D-Bus activatable applications, the app ID is used as the
+	 * D-Bus service name.
+	 *
+	 * The compositor shell will try to group application surfaces
+	 * together by their app ID. As a best practice, it is suggested to
+	 * select app ID's that match the basename of the application's
+	 * .desktop file. For example, "org.freedesktop.FooViewer" where
+	 * the .desktop file is "org.freedesktop.FooViewer.desktop".
+	 *
+	 * See the desktop-entry specification [0] for more details on
+	 * application identifiers and how they relate to well-known D-Bus
+	 * names and .desktop files.
+	 *
+	 * [0] http://standards.freedesktop.org/desktop-entry-spec/
+	 */
+	void (*set_app_id)(struct wl_client *client,
+			   struct wl_resource *resource,
+			   const char *app_id);
+	/**
+	 * show the window menu
+	 *
+	 * Clients implementing client-side decorations might want to
+	 * show a context menu when right-clicking on the decorations,
+	 * giving the user a menu that they can use to maximize or minimize
+	 * the window.
+	 *
+	 * This request asks the compositor to pop up such a window menu at
+	 * the given position, relative to the local surface coordinates of
+	 * the parent surface. There are no guarantees as to what menu
+	 * items the window menu contains.
+	 *
+	 * This request must be used in response to some sort of user
+	 * action like a button press, key press, or touch down event.
+	 * @param seat the wl_seat of the user event
+	 * @param serial the serial of the user event
+	 * @param x the x position to pop up the window menu at
+	 * @param y the y position to pop up the window menu at
+	 */
+	void (*show_window_menu)(struct wl_client *client,
+				 struct wl_resource *resource,
+				 struct wl_resource *seat,
+				 uint32_t serial,
+				 int32_t x,
+				 int32_t y);
+	/**
+	 * start an interactive move
+	 *
+	 * Start an interactive, user-driven move of the surface.
+	 *
+	 * This request must be used in response to some sort of user
+	 * action like a button press, key press, or touch down event. The
+	 * passed serial is used to determine the type of interactive move
+	 * (touch, pointer, etc).
+	 *
+	 * The server may ignore move requests depending on the state of
+	 * the surface (e.g. fullscreen or maximized), or if the passed
+	 * serial is no longer valid.
+	 *
+	 * If triggered, the surface will lose the focus of the device
+	 * (wl_pointer, wl_touch, etc) used for the move. It is up to the
+	 * compositor to visually indicate that the move is taking place,
+	 * such as updating a pointer cursor, during the move. There is no
+	 * guarantee that the device focus will return when the move is
+	 * completed.
+	 * @param seat the wl_seat of the user event
+	 * @param serial the serial of the user event
+	 */
+	void (*move)(struct wl_client *client,
+		     struct wl_resource *resource,
+		     struct wl_resource *seat,
+		     uint32_t serial);
+	/**
+	 * start an interactive resize
+	 *
+	 * Start a user-driven, interactive resize of the surface.
+	 *
+	 * This request must be used in response to some sort of user
+	 * action like a button press, key press, or touch down event. The
+	 * passed serial is used to determine the type of interactive
+	 * resize (touch, pointer, etc).
+	 *
+	 * The server may ignore resize requests depending on the state of
+	 * the surface (e.g. fullscreen or maximized).
+	 *
+	 * If triggered, the client will receive configure events with the
+	 * "resize" state enum value and the expected sizes. See the
+	 * "resize" enum value for more details about what is required. The
+	 * client must also acknowledge configure events using
+	 * "ack_configure". After the resize is completed, the client will
+	 * receive another "configure" event without the resize state.
+	 *
+	 * If triggered, the surface also will lose the focus of the device
+	 * (wl_pointer, wl_touch, etc) used for the resize. It is up to the
+	 * compositor to visually indicate that the resize is taking place,
+	 * such as updating a pointer cursor, during the resize. There is
+	 * no guarantee that the device focus will return when the resize
+	 * is completed.
+	 *
+	 * The edges parameter specifies how the surface should be resized,
+	 * and is one of the values of the resize_edge enum. The compositor
+	 * may use this information to update the surface position for
+	 * example when dragging the top left corner. The compositor may
+	 * also use this information to adapt its behavior, e.g. choose an
+	 * appropriate cursor image.
+	 * @param seat the wl_seat of the user event
+	 * @param serial the serial of the user event
+	 * @param edges which edge or corner is being dragged
+	 */
+	void (*resize)(struct wl_client *client,
+		       struct wl_resource *resource,
+		       struct wl_resource *seat,
+		       uint32_t serial,
+		       uint32_t edges);
+	/**
+	 * ack a configure event
+	 *
+	 * When a configure event is received, if a client commits the
+	 * surface in response to the configure event, then the client must
+	 * make a ack_configure request before the commit request, passing
+	 * along the serial of the configure event.
+	 *
+	 * For instance, the compositor might use this information to move
+	 * a surface to the top left only when the client has drawn itself
+	 * for the maximized or fullscreen state.
+	 *
+	 * If the client receives multiple configure events before it can
+	 * respond to one, it only has to ack the last configure event.
+	 * @param serial the serial from the configure event
+	 */
+	void (*ack_configure)(struct wl_client *client,
+			      struct wl_resource *resource,
+			      uint32_t serial);
+	/**
+	 * set the new window geometry
+	 *
+	 * The window geometry of a window is its "visible bounds" from
+	 * the user's perspective. Client-side decorations often have
+	 * invisible portions like drop-shadows which should be ignored for
+	 * the purposes of aligning, placing and constraining windows.
+	 *
+	 * The window geometry is double buffered, and will be applied at
+	 * the time wl_surface.commit of the corresponding wl_surface is
+	 * called.
+	 *
+	 * Once the window geometry of the surface is set once, it is not
+	 * possible to unset it, and it will remain the same until
+	 * set_window_geometry is called again, even if a new subsurface or
+	 * buffer is attached.
+	 *
+	 * If never set, the value is the full bounds of the surface,
+	 * including any subsurfaces. This updates dynamically on every
+	 * commit. This unset mode is meant for extremely simple clients.
+	 *
+	 * If responding to a configure event, the window geometry in here
+	 * must respect the sizing negotiations specified by the states in
+	 * the configure event.
+	 *
+	 * The arguments are given in the surface local coordinate space of
+	 * the wl_surface associated with this xdg_surface.
+	 *
+	 * The width and height must be greater than zero.
+	 */
+	void (*set_window_geometry)(struct wl_client *client,
+				    struct wl_resource *resource,
+				    int32_t x,
+				    int32_t y,
+				    int32_t width,
+				    int32_t height);
+	/**
+	 * maximize the window
+	 *
+	 * Maximize the surface.
+	 *
+	 * After requesting that the surface should be maximized, the
+	 * compositor will respond by emitting a configure event with the
+	 * "maximized" state and the required window geometry. The client
+	 * should then update its content, drawing it in a maximized state,
+	 * i.e. without shadow or other decoration outside of the window
+	 * geometry. The client must also acknowledge the configure when
+	 * committing the new content (see ack_configure).
+	 *
+	 * It is up to the compositor to decide how and where to maximize
+	 * the surface, for example which output and what region of the
+	 * screen should be used.
+	 *
+	 * If the surface was already maximized, the compositor will still
+	 * emit a configure event with the "maximized" state.
+	 */
+	void (*set_maximized)(struct wl_client *client,
+			      struct wl_resource *resource);
+	/**
+	 * unmaximize the window
+	 *
+	 * Unmaximize the surface.
+	 *
+	 * After requesting that the surface should be unmaximized, the
+	 * compositor will respond by emitting a configure event without
+	 * the "maximized" state. If available, the compositor will include
+	 * the window geometry dimensions the window had prior to being
+	 * maximized in the configure request. The client must then update
+	 * its content, drawing it in a regular state, i.e. potentially
+	 * with shadow, etc. The client must also acknowledge the configure
+	 * when committing the new content (see ack_configure).
+	 *
+	 * It is up to the compositor to position the surface after it was
+	 * unmaximized; usually the position the surface had before
+	 * maximizing, if applicable.
+	 *
+	 * If the surface was already not maximized, the compositor will
+	 * still emit a configure event without the "maximized" state.
+	 */
+	void (*unset_maximized)(struct wl_client *client,
+				struct wl_resource *resource);
+	/**
+	 * set the window as fullscreen on a monitor
+	 *
+	 * Make the surface fullscreen.
+	 *
+	 * You can specify an output that you would prefer to be
+	 * fullscreen. If this value is NULL, it's up to the compositor to
+	 * choose which display will be used to map this surface.
+	 *
+	 * If the surface doesn't cover the whole output, the compositor
+	 * will position the surface in the center of the output and
+	 * compensate with black borders filling the rest of the output.
+	 */
+	void (*set_fullscreen)(struct wl_client *client,
+			       struct wl_resource *resource,
+			       struct wl_resource *output);
+	/**
+	 */
+	void (*unset_fullscreen)(struct wl_client *client,
+				 struct wl_resource *resource);
+	/**
+	 * set the window as minimized
+	 *
+	 * Request that the compositor minimize your surface. There is no
+	 * way to know if the surface is currently minimized, nor is there
+	 * any way to unset minimization on this surface.
+	 *
+	 * If you are looking to throttle redrawing when minimized, please
+	 * instead use the wl_surface.frame event for this, as this will
+	 * also work with live previews on windows in Alt-Tab, Expose or
+	 * similar compositor features.
+	 */
+	void (*set_minimized)(struct wl_client *client,
+			      struct wl_resource *resource);
+};
+
+#define XDG_SURFACE_CONFIGURE 0
+#define XDG_SURFACE_CLOSE 1
+
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_CONFIGURE_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_CLOSE_SINCE_VERSION 1
+
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_DESTROY_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_SET_PARENT_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_SET_TITLE_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_SET_APP_ID_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_SHOW_WINDOW_MENU_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_MOVE_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_RESIZE_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_ACK_CONFIGURE_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_SET_WINDOW_GEOMETRY_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_SET_MAXIMIZED_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_UNSET_MAXIMIZED_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_SET_FULLSCREEN_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_UNSET_FULLSCREEN_SINCE_VERSION 1
+/**
+ * @ingroup iface_xdg_surface
+ */
+#define XDG_SURFACE_SET_MINIMIZED_SINCE_VERSION 1
+
+/**
+ * @ingroup iface_xdg_surface
+ * Sends an configure event to the client owning the resource.
+ * @param resource_ The client's resource
+ */
+static inline void
+xdg_surface_send_configure(struct wl_resource *resource_, int32_t width, int32_t height, struct wl_array *states, uint32_t serial)
+{
+	wl_resource_post_event(resource_, XDG_SURFACE_CONFIGURE, width, height, states, serial);
+}
+
+/**
+ * @ingroup iface_xdg_surface
+ * Sends an close event to the client owning the resource.
+ * @param resource_ The client's resource
+ */
+static inline void
+xdg_surface_send_close(struct wl_resource *resource_)
+{
+	wl_resource_post_event(resource_, XDG_SURFACE_CLOSE);
+}
+
+/**
+ * @ingroup iface_xdg_popup
+ * @struct xdg_popup_v5_interface
+ */
+struct xdg_popup_v5_interface {
+	/**
+	 * remove xdg_popup interface
+	 *
+	 * This destroys the popup. Explicitly destroying the xdg_popup
+	 * object will also dismiss the popup, and unmap the surface.
+	 *
+	 * If this xdg_popup is not the "topmost" popup, a protocol error
+	 * will be sent.
+	 */
+	void (*destroy)(struct wl_client *client,
+			struct wl_resource *resource);
+};
+
+#define XDG_POPUP_POPUP_DONE 0
+
+/**
+ * @ingroup iface_xdg_popup
+ */
+#define XDG_POPUP_POPUP_DONE_SINCE_VERSION 1
+
+/**
+ * @ingroup iface_xdg_popup
+ */
+#define XDG_POPUP_DESTROY_SINCE_VERSION 1
+
+/**
+ * @ingroup iface_xdg_popup
+ * Sends an popup_done event to the client owning the resource.
+ * @param resource_ The client's resource
+ */
+static inline void
+xdg_popup_send_popup_done(struct wl_resource *resource_)
+{
+	wl_resource_post_event(resource_, XDG_POPUP_POPUP_DONE);
+}
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/compositor/extensions/pregenerated/xdg-shell-v5.pri b/src/compositor/extensions/pregenerated/xdg-shell-v5.pri
new file mode 100644
index 000000000..48d163f17
--- /dev/null
+++ b/src/compositor/extensions/pregenerated/xdg-shell-v5.pri
@@ -0,0 +1,10 @@
+# Putting pregenerated files in a 3rdparty directory to avoid
+# qtqa's license checking failing.
+
+HEADERS += \
+    $$PWD/3rdparty/qwayland-server-xdg-shell-unstable-v5_p.h \
+    $$PWD/3rdparty/wayland-xdg-shell-unstable-v5-server-protocol_p.h
+
+SOURCES += \
+    $$PWD/3rdparty/qwayland-server-xdg-shell-unstable-v5.cpp \
+    $$PWD/3rdparty/wayland-xdg-shell-unstable-v5-protocol.c
diff --git a/src/compositor/extensions/qwaylandxdgshellv5.cpp b/src/compositor/extensions/qwaylandxdgshellv5.cpp
index 424335184..a6e88aabb 100644
--- a/src/compositor/extensions/qwaylandxdgshellv5.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv5.cpp
@@ -148,7 +148,7 @@ void QWaylandXdgShellV5Private::xdg_shell_get_xdg_surface(Resource *resource, ui
     if (!surface->setRole(QWaylandXdgSurfaceV5::role(), resource->handle, XDG_SHELL_ERROR_ROLE))
         return;
 
-    QWaylandResource xdgSurfaceResource(wl_resource_create(resource->client(), &xdg_surface_interface,
+    QWaylandResource xdgSurfaceResource(wl_resource_create(resource->client(), &xdg_surface_v5_interface,
                                                            wl_resource_get_version(resource->handle), id));
 
     emit q->xdgSurfaceRequested(surface, xdgSurfaceResource);
@@ -166,10 +166,10 @@ void QWaylandXdgShellV5Private::xdg_shell_get_xdg_surface(Resource *resource, ui
 
 void QWaylandXdgShellV5Private::xdg_shell_use_unstable_version(Resource *resource, int32_t version)
 {
-    if (xdg_shell::version_current != version) {
+    if (xdg_shell_v5::version_current != version) {
         wl_resource_post_error(resource->handle, WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "incompatible version, server is %d, but client wants %d",
-                               xdg_shell::version_current, version);
+                               xdg_shell_v5::version_current, version);
     }
 }
 
@@ -193,7 +193,7 @@ void QWaylandXdgShellV5Private::xdg_shell_get_xdg_popup(Resource *resource, uint
         return;
     }
 
-    QWaylandResource xdgPopupResource (wl_resource_create(resource->client(), &xdg_popup_interface,
+    QWaylandResource xdgPopupResource (wl_resource_create(resource->client(), &xdg_popup_v5_interface,
                                                           wl_resource_get_version(resource->handle), id));
     QWaylandSeat *seat = QWaylandSeat::fromSeatResource(seatResource);
     QPoint position(x, y);
diff --git a/src/compositor/extensions/qwaylandxdgshellv5_p.h b/src/compositor/extensions/qwaylandxdgshellv5_p.h
index 032441e8d..681c4537b 100644
--- a/src/compositor/extensions/qwaylandxdgshellv5_p.h
+++ b/src/compositor/extensions/qwaylandxdgshellv5_p.h
@@ -41,7 +41,7 @@
 #define QWAYLANDXDGSHELLV5_P_H
 
 #include <QtWaylandCompositor/private/qwaylandcompositorextension_p.h>
-#include <QtWaylandCompositor/private/qwayland-server-xdg-shell-unstable-v5.h>
+#include <QtWaylandCompositor/private/qwayland-server-xdg-shell-unstable-v5_p.h>
 
 #include <QtWaylandCompositor/QWaylandXdgShellV5>
 
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgShellV5Private
         : public QWaylandCompositorExtensionPrivate
-        , public QtWaylandServer::xdg_shell
+        , public QtWaylandServer::xdg_shell_v5
 {
     Q_DECLARE_PUBLIC(QWaylandXdgShellV5)
 public:
@@ -95,7 +95,7 @@ protected:
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgSurfaceV5Private
         : public QWaylandCompositorExtensionPrivate
-        , public QtWaylandServer::xdg_surface
+        , public QtWaylandServer::xdg_surface_v5
 {
     Q_DECLARE_PUBLIC(QWaylandXdgSurfaceV5)
 public:
@@ -158,7 +158,7 @@ private:
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPopupV5Private
         : public QWaylandCompositorExtensionPrivate
-        , public QtWaylandServer::xdg_popup
+        , public QtWaylandServer::xdg_popup_v5
 {
     Q_DECLARE_PUBLIC(QWaylandXdgPopupV5)
 
@@ -172,7 +172,7 @@ public:
     QPoint m_position;
 
     void xdg_popup_destroy_resource(Resource *resource) override;
-    void xdg_popup_destroy(xdg_popup::Resource *resource) override;
+    void xdg_popup_destroy(xdg_popup_v5::Resource *resource) override;
 
     static QWaylandSurfaceRole s_role;
 };