diff --git a/src/3rdparty/wayland/protocols/cursor-shape-v1.xml b/src/3rdparty/wayland/protocols/cursor-shape/cursor-shape-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/cursor-shape-v1.xml
rename to src/3rdparty/wayland/protocols/cursor-shape/cursor-shape-v1.xml
diff --git a/src/3rdparty/wayland/protocols/fractional-scale-v1.xml b/src/3rdparty/wayland/protocols/fractional-scale/fractional-scale-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/fractional-scale-v1.xml
rename to src/3rdparty/wayland/protocols/fractional-scale/fractional-scale-v1.xml
diff --git a/src/3rdparty/wayland/protocols/fractional-scale/qt_attribution.json b/src/3rdparty/wayland/protocols/fractional-scale/qt_attribution.json
new file mode 100644
index 00000000000..653a8eb0c15
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/fractional-scale/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "fractional-scale-v1",
+ "Name": "Wayland Fractional Scale Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland platform plugin",
+ "Files": "fractional-scale-v1.xml",
+
+ "Description": "Send a preferred scale to different clients",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "1",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/raw/1.31/unstable/fractional-scale/fractional-scale-v1.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2022 Kenny Levinsen"
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/fullscreen-shell-unstable-v1.xml b/src/3rdparty/wayland/protocols/fullscreen-shell/fullscreen-shell-unstable-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/fullscreen-shell-unstable-v1.xml
rename to src/3rdparty/wayland/protocols/fullscreen-shell/fullscreen-shell-unstable-v1.xml
diff --git a/src/3rdparty/wayland/protocols/fullscreen-shell/qt_attribution.json b/src/3rdparty/wayland/protocols/fullscreen-shell/qt_attribution.json
new file mode 100644
index 00000000000..07926f16429
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/fullscreen-shell/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-fullscreen-protocol",
+ "Name": "Wayland Fullscreen Shell Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland platform plugin.",
+ "Files": "fullscreen-shell-unstable-v1.xml",
+
+ "Description": "A Wayland shell for displaying a single surface per output",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "unstable v1",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2016 Yong Bakos\nCopyright © 2015 Jason Ekstrand\nCopyright © 2015 Jonas Ådahl"
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/idle-inhibit-unstable-v1.xml b/src/3rdparty/wayland/protocols/idle-inhibit/idle-inhibit-unstable-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/idle-inhibit-unstable-v1.xml
rename to src/3rdparty/wayland/protocols/idle-inhibit/idle-inhibit-unstable-v1.xml
diff --git a/src/3rdparty/wayland/protocols/ivi-application.xml b/src/3rdparty/wayland/protocols/ivi-application.xml
deleted file mode 100644
index 8f242268849..00000000000
--- a/src/3rdparty/wayland/protocols/ivi-application.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
- Copyright (C) 2013 DENSO CORPORATION
- Copyright (c) 2013 BMW Car IT GmbH
-
- 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.
-
-
-
-
-
-
-
- This removes link from ivi_id to wl_surface and destroys ivi_surface.
- The ID, ivi_id, is free and can be used for surface_create again.
-
-
-
-
-
- The configure event asks the client to resize its surface.
-
- The size is a hint, in the sense that the client is free to
- ignore it if it doesn't resize, pick a smaller size (to
- satisfy aspect ratio or resize in steps of NxM pixels).
-
- The client is free to dismiss all but the last configure
- event it received.
-
- The width and height arguments specify the size of the window
- in surface local coordinates.
-
-
-
-
-
-
-
-
- This interface is exposed as a global singleton.
- This interface is implemented by servers that provide IVI-style user interfaces.
- It allows clients to associate a ivi_surface with wl_surface.
-
-
-
-
-
-
-
-
-
- This request gives the wl_surface the role of an IVI Surface. Creating more than
- one ivi_surface for a wl_surface is not allowed. Note, that this still allows the
- following example:
-
- 1. create a wl_surface
- 2. create ivi_surface for the wl_surface
- 3. destroy the ivi_surface
- 4. create ivi_surface for the wl_surface (with the same or another ivi_id as before)
-
- surface_create will create a interface:ivi_surface with numeric ID; ivi_id in
- ivi compositor. These ivi_ids are defined as unique in the system to identify
- it inside of ivi compositor. The ivi compositor implements business logic how to
- set properties of the surface with ivi_id according to status of the system.
- E.g. a unique ID for Car Navigation application is used for implementing special
- logic of the application about where it shall be located.
- The server regards following cases as protocol errors and disconnects the client.
- - wl_surface already has an nother role.
- - ivi_id is already assigned to an another wl_surface.
-
- If client destroys ivi_surface or wl_surface which is assigne to the ivi_surface,
- ivi_id which is assigned to the ivi_surface is free for reuse.
-
-
-
-
-
-
-
-
-
diff --git a/src/3rdparty/wayland/protocols/ivi-controller.xml b/src/3rdparty/wayland/protocols/ivi-controller.xml
deleted file mode 100644
index 521d62525a8..00000000000
--- a/src/3rdparty/wayland/protocols/ivi-controller.xml
+++ /dev/null
@@ -1,603 +0,0 @@
-
-
-
-
- Copyright (C) 2013 DENSO CORPORATION
- Copyright (c) 2013 BMW Car IT GmbH
-
- 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 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.
-
-
-
-
-
-
-
- If visibility argument is 0, the surface in the ivi compositor is set to invisible.
- If visibility argument is not 0, the surface in the ivi compositor is set to visible.
-
-
-
-
-
-
- The valid range for opacity is 0.0 (fully transparent) to 1.0 (fully opaque).
-
-
-
-
-
-
- The source rectangle defines the part of the surface content, that is used for
- compositing the surface. It can be used, if valid content of the surface is smaller
- than the surface. Effectively it can be used to zoom the content of the surface.
- x: horizontal start position of scanout area within the surface
- y: vertical start position of scanout area within the surface
- width: width of scanout area within the surface
- height: height of scanout area within the surface
-
-
-
-
-
-
-
-
-
- The destination rectangle defines the position and size of a surface on a layer.
- The surface will be scaled to this rectangle for rendering.
- x: horizontal start position of surface within the layer
- y: vertical start position of surface within the layer
- width : width of surface within the layer
- height: height of surface within the layer
-
-
-
-
-
-
-
-
-
- Request the client providing content for this surface, to resize of the buffers
- provided as surface content.
-
-
-
-
-
-
-
- The orientation of a surface in ivi compositor can be rotated in 90 degree steps,
- as defined in orientation enum.
-
-
-
-
-
-
- Store a screenshot of the surface content in the file provided by argument filename.
-
-
-
-
-
-
- The new visibility state is provided in argument visibility.
- If visibility is 0, the surface has become invisible.
- If visibility is not 0, the surface has become visible.
-
-
-
-
-
-
- The new opacity state is provided in argument opacity.
- The valid range for opactiy is 0.0 (fully transparent) to 1.0 (fully opaque).
-
-
-
-
-
-
- The scanout region of the surface content has changed.
- The new values for source rectangle are provided by
- x: new horizontal start position of scanout area within the surface
- y: new vertical start position of scanout area within the surface
- width: new width of scanout area within the surface
- height: new height of scanout area within the surface
-
-
-
-
-
-
-
-
-
- The new values for source rectangle are provided by
- x: new horizontal start position of surface within the layer
- y: new vertical start position of surface within the layer
- width : new width of surface within the layer
- height: new height of surface within the layer
-
-
-
-
-
-
-
-
-
- The client providing content for this surface was requested to resize the buffer
- provided as surface content. The requested buffer size is provided by arguments
- width and height.
-
-
-
-
-
-
-
- The surfaces in ivi controller can be rotated in 90 degrees steps.
- This enum defines all valid orientations for surfaces.
-
-
-
-
-
-
-
-
-
- The new orientation status is provided by argument orientation.
-
-
-
-
-
-
- Applications can provide buffers as surface content with differernt buffer
- properties. This enum defines all supported buffer configurations.
-
-
-
-
-
-
-
-
-
-
-
-
-
- When client attach buffers as surface content, these buffers have a pixelformat
- configuration. If the pixelformat of a newly attached buffer is different from
- the previous buffer configuration, this event is raised.
- This is also done, when the first buffer is provided by application.
-
-
-
-
-
-
- This surface was added to the render order of the layer defined by argument layer.
- This is essential for a surface to become visible on screen, since ivi compositors
- will only render layers (or more precise all surfaces in the render order of a layer).
-
-
-
-
-
-
- These stats contain information required for monitoring, debugging, logging
- and tracing.
-
-
-
-
-
- The information contained in this event is essential for monitoring, debugging,
- logging and tracing support in IVI systems.
-
-
-
-
-
-
-
-
-
-
- Request to destroy the ivi_controller_surface. If argument
- destroy_scene_object id not 0, the surface will be destroyed in
- ivi compositor. If argument is 0, only the proxy object is destroyed.
-
-
-
-
-
-
-
-
-
-
- This enum defines all possible content states of a surface. This is
- required, since surfaces in ivi compositor can exist without applications
- providing content for them.
-
-
-
-
-
-
-
- Surfaces in ivi compositor can exist without any application or controller
- referencing it. All surfaces initially have no content. This event indicates
- when content state has changed. All possible content states are defined
- in enum content_state.
-
-
-
-
-
-
-
-
-
-
-
- If visibility argument is 0, the layer in the ivi compositor is set to invisible.
- If visibility argument is not 0, the layer in the ivi compositor is set to visible.
-
-
-
-
-
-
- The valid range for opacity is 0.0 (fully transparent) to 1.0 (fully opaque).
-
-
-
-
-
-
- The source rectangle defines the part of the layer content, that is used for
- compositing the screen. It can be used, if valid content of the layer is smaller
- than the layer. Effectively it can be used to zoom the content of the layer.
- x: horizontal start position of scanout area within the layer
- y: vertical start position of scanout area within the layer
- width: width of scanout area within the layer
- height: height of scanout area within the layer
-
-
-
-
-
-
-
-
-
- The destination rectangle defines the position and size of a layer on a screen.
- The layer will be scaled to this rectangle for rendering.
- x: horizontal start position of layer within the screen
- y: vertical start position of layer within the screen
- width : width of surface within the screen
- height: height of surface within the screen
-
-
-
-
-
-
-
-
-
- Layers are created with an initial size, but they can be resized at runtime.
- This request changes the widht and height of a layer.
-
-
-
-
-
-
-
- The orientation of a layer in ivi compositor can be rotated in 90 degree steps,
- as defined in orientation enum.
-
-
-
-
-
-
- Store a screenshot of the layer content in the file provided by argument filename.
-
-
-
-
-
-
- A layer has no content assigned to itself, it is a container for surfaces.
- This request removes all surfaces from the layer render order.
- Note: the surfaces are not destroyed, they are just no longer contained by
- the layer.
-
-
-
-
-
- A layer has no content assigned to itself, it is a container for surfaces.
- This request adds a surface to the topmost position of the layer render order.
- The added surface will cover all other surfaces of the layer.
-
-
-
-
-
-
- A layer has no content assigned to itself, it is a container for surfaces.
- This request removes one surfaces from the layer render order.
- Note: the surface is not destroyed, it is just no longer contained by
- the layer.
-
-
-
-
-
-
- A layer has no content assigned to itself, it is a container for surfaces.
- This request removes all surfaces from the layer render order and set a
- completely new render order.
-
-
-
-
-
-
- The new visibility state is provided in argument visibility.
- If visibility is 0, the layer has become invisible.
- If visibility is not 0, the layer has become visible.
-
-
-
-
-
-
- The new opacity state is provided in argument opacity.
- The valid range for opactiy is 0.0 (fully transparent) to 1.0 (fully opaque).
-
-
-
-
-
-
- The scanout region of the layer content has changed.
- The new values for source rectangle are provided by
- x: new horizontal start position of scanout area within the layer
- y: new vertical start position of scanout area within the layer
- width: new width of scanout area within the layer
- height: new height of scanout area within the layer
-
-
-
-
-
-
-
-
-
- The new values for source rectangle are provided by
- x: new horizontal start position of layer within the screen
- y: new vertical start position of layer within the screen
- width : new width of layer within the screen
- height: new height of layer within the screen
-
-
-
-
-
-
-
-
-
- The layer was resized. The new layer size is provided by arguments
- width and height.
-
-
-
-
-
-
-
- The new orientation status is provided by argument orientation.
-
-
-
-
-
-
- This layer was added to the render order of the screen defined by argument screen.
- This is essential for a layer to become visible on screen, since ivi compositors
- will only render screens (or more precise all layers in the render order of a screen).
-
-
-
-
-
-
- Request to destroy the ivi_controller_layer. If argument
- destroy_scene_object id not 0, the layer will be destroyed in
- ivi compositor. If argument is 0, only the proxy object is destroyed.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- A screen has no content assigned to itself, it is a container for layers.
- This request removes all layers from the screen render order.
- Note: the layers are not destroyed, they are just no longer contained by
- the screen.
-
-
-
-
-
- A screen has no content assigned to itself, it is a container for layers.
- This request adds a layers to the topmost position of the screen render order.
- The added layer will cover all other layers of the screen.
-
-
-
-
-
-
- Store a screenshot of the screen content in the file provided by argument filename.
-
-
-
-
-
-
- A screen has no content assigned to itself, it is a container for layers.
- This request removes all layers from the screen render order and set a
- completely new render order.
-
-
-
-
-
-
-
-
-
-
-
- All requests are not applied directly to scene object, so a controller
- can set different properties and apply the changes all at once.
- Note: there's an exception to this. Creation and destruction of
- scene objects is executed immediately.
-
-
-
-
-
- A new screen is announced to the controller. This is typically
- the case in two cases:
- 1. controller was just started, ivi compositor announces existing screen
- 2. a new screen was added to the system at runtime
-
-
-
-
-
-
-
- layer_create will create a new layer with id_layer in ivi compositor,
- if it does not yet exists. If the layer with id_layer already exists in
- ivi compositor, a handle to the existing layer is returned and width and
- height properties are ignored.
-
-
-
-
-
-
-
-
-
- A new layer is announced to the controller.
-
-
-
-
-
-
- surface_create will create a new surface with id_surface in ivi compositor,
- if it does not yet exists. If the surface with id_surface already exists in
- ivi compositor, a handle to the existing surface is returned.
-
-
-
-
-
-
-
- A new surface is announced to the controller.
-
-
-
-
-
-
- This enum defines all scene object available in ivi compositor.
-
-
-
-
-
-
-
-
- These error codes define all possible error codes returned by ivi compositor
- on server-side errors.
-
-
-
-
-
-
-
- The ivi compositor encountered error while processing a request by this
- controller. The error is defined by argument error_code and optional
- error_text. Additionally the object type and id is contained in the error
- event to provide some detailes to handle the error.
- If the controller requires to associate this error event to a request,
- it can
- 1. send request
- 2. force display roundtrip
- 3. check, if error event was received
- but this restricts the controller to have only one open request at a time.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/3rdparty/wayland/protocols/linux-dmabuf-unstable-v1.xml b/src/3rdparty/wayland/protocols/linux-dmabuf/linux-dmabuf-unstable-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/linux-dmabuf-unstable-v1.xml
rename to src/3rdparty/wayland/protocols/linux-dmabuf/linux-dmabuf-unstable-v1.xml
diff --git a/src/3rdparty/wayland/protocols/linux-dmabuf/qt_attribution.json b/src/3rdparty/wayland/protocols/linux-dmabuf/qt_attribution.json
new file mode 100644
index 00000000000..e93e2e790b1
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/linux-dmabuf/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-linux-dmabuf-unstable-v1",
+ "Name": "Wayland Linux Dmabuf Unstable V1 Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland Compositor",
+ "Files": "linux-dmabuf-unstable-v1.xml",
+
+ "Description": "The linux dmabuf protocol is a way to create dmabuf-based wl_buffers",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "unstable v1, version 3",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2014, 2015 Collabora, Ltd."
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/pointer-gestures-unstable-v1.xml b/src/3rdparty/wayland/protocols/pointer-gestures/pointer-gestures-unstable-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/pointer-gestures-unstable-v1.xml
rename to src/3rdparty/wayland/protocols/pointer-gestures/pointer-gestures-unstable-v1.xml
diff --git a/src/3rdparty/wayland/protocols/pointer-gestures/qt_attribution.json b/src/3rdparty/wayland/protocols/pointer-gestures/qt_attribution.json
new file mode 100644
index 00000000000..9cd44450e74
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/pointer-gestures/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-pointer-gestures-protocol",
+ "Name": "Wayland Pointer Gestures Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland platform plugin",
+ "Files": "pointer-gestures-unstable-v1.xml",
+
+ "Description": "",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "unstable v1, version 2",
+ "DownloadLocation": "https://cgit.freedesktop.org/wayland/wayland-protocols/plain/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2015, 2016 Red Hat"
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/presentation-time.xml b/src/3rdparty/wayland/protocols/presentation-time/presentation-time.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/presentation-time.xml
rename to src/3rdparty/wayland/protocols/presentation-time/presentation-time.xml
diff --git a/src/3rdparty/wayland/protocols/presentation-time/qt_attribution.json b/src/3rdparty/wayland/protocols/presentation-time/qt_attribution.json
new file mode 100644
index 00000000000..8d54400d334
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/presentation-time/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "presentation-time.xml",
+ "Name": "Presentation Time Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland Compositor",
+ "Files": "presentation-time.xml",
+
+ "Description": "The presentaton time protocol is a way to get presentation timing feedback.",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "1",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/stable/presentation-time/presentation-time.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2013, 2014 Collabora, Ltd."
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/qt_attribution.json b/src/3rdparty/wayland/protocols/qt_attribution.json
deleted file mode 100644
index 6ced46a2b6c..00000000000
--- a/src/3rdparty/wayland/protocols/qt_attribution.json
+++ /dev/null
@@ -1,357 +0,0 @@
-[
- {
- "Id": "wayland-fullscreen-protocol",
- "Name": "Wayland Fullscreen Shell Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland platform plugin.",
- "Files": "fullscreen-shell-unstable-v1.xml",
-
- "Description": "A Wayland shell for displaying a single surface per output",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "unstable v1",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2016 Yong Bakos\nCopyright © 2015 Jason Ekstrand\nCopyright © 2015 Jonas Ådahl"
- },
-
- {
- "Id": "wayland-protocol",
- "Name": "Wayland Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
- "Files": "wayland.xml",
-
- "Description": "Wayland is a protocol for a compositor to talk to its clients.",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "1.19.0",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland/raw/1.19.0/protocol/wayland.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2008-2011 Kristian Høgsberg\nCopyright © 2010-2011 Intel Corporation\nCopyright © 2012-2013 Collabora, Ltd."
- },
-
- {
- "Id": "wayland-ivi-extension-protocol",
- "Name": "Wayland IVI Extension Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
- "Files": "ivi-controller.xml ivi-application.xml",
-
- "Description": "\"Wayland IVI Extension\" is forked from IVI Layer Management to define a common set of APIs by wayland style protocol and provide reference implementation which can be loaded on Weston.",
- "Homepage": "https://at.projects.genivi.org/wiki/display/WIE/Wayland+IVI+Extension+Home",
- "Version": "1.9.1",
- "DownloadLocation": "https://github.com/GENIVI/wayland-ivi-extension/releases/tag/1.9.1",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright (C) 2013 DENSO CORPORATION\nCopyright (c) 2013 BMW Car IT GmbH"
- },
-
- {
- "Id": "wayland-pointer-gestures-protocol",
- "Name": "Wayland Pointer Gestures Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland platform plugin",
- "Files": "pointer-gestures-unstable-v1.xml",
-
- "Description": "",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "unstable v1, version 2",
- "DownloadLocation": "https://cgit.freedesktop.org/wayland/wayland-protocols/plain/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2015, 2016 Red Hat"
- },
-
- {
- "Id": "wayland-primary-selection-protocol",
- "Name": "Wayland Primary Selection Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland platform plugin",
- "Files": "wp-primary-selection-unstable-v1.xml",
-
- "Description": "The primary selection extension allows copying text by selecting it and pasting it with the middle mouse button.",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "1",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/unstable/primary-selection/primary-selection-unstable-v1.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2015, 2016 Red Hat"
- },
-
- {
- "Id": "wayland-scaler-protocol",
- "Name": "Wayland Scaler Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor API",
- "Files": "scaler.xml",
-
- "Description": "The Wayland scaler extension allows a client to scale or crop a surface without modifying the buffer",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "2",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/weston/raw/1.11/protocol/scaler.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2013-2014 Collabora, Ltd."
- },
-
- {
- "Id": "wayland-tablet-protocol",
- "Name": "Wayland Tablet Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland platform plugin",
- "Files": "tablet-unstable-v2.xml",
-
- "Description": "",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "unstable v2, version 1",
- "DownloadLocation": "https://cgit.freedesktop.org/wayland/wayland-protocols/plain/unstable/tablet/tablet-unstable-v2.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright 2014 © Stephen \"Lyude\" Chandler Paul\nCopyright 2015-2016 © Red Hat, Inc."
- },
-
- {
- "Id": "wayland-text-input-unstable-v3",
- "Name": "Wayland Text Input Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
- "Files": "text-input-unstable-v3.xml",
- "Description": "Adds support for compositors to act as input methods and send text to applications.",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "unstable v3",
- "DownloadLocation": "https://cgit.freedesktop.org/wayland/wayland-protocols/plain/unstable/text-input/text-input-unstable-v3.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2012, 2013 Intel Corporation\nCopyright © 2015, 2016 Jan Arne Petersen\nCopyright © 2017, 2018 Red Hat, Inc.\nCopyright © 2018 Purism SPC"
- },
-
- {
- "Id": "wayland-viewporter-protocol",
- "Name": "Wayland Viewporter Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor API",
- "Files": "viewporter.xml",
-
- "Description": "The Wayland viewporter extension allows a client to scale or crop a surface without modifying the buffer",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "1",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/stable/viewporter/viewporter.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2013-2016 Collabora, Ltd."
- },
-
- {
- "Id": "wayland-xdg-activation",
- "Name": "Wayland xdg-activation Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland platform plugin",
- "Files": "xdg-activation-v1.xml",
-
- "Description": "The xdg-activation protocol provides a way for one client to pass focus to another.",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "unstable v1, version 1",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/blob/main/staging/xdg-activation/xdg-activation-v1.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2020 Aleix Pol Gonzalez <aleixpol@kde.org>\nCopyright © 2020 Carlos Garnacho <carlosg@gnome.org>"
-
- },
-
- {
- "Id": "wayland-xdg-decoration-protocol",
- "Name": "Wayland xdg-decoration Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor API, and the Qt Wayland platform plugin.",
- "Files": "xdg-decoration-unstable-v1.xml",
-
- "Description": "The xdg-decoration protocol allows a compositor to announce support for server-side decorations.",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "unstable v1, version 1",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2018 Simon Ser"
- },
-
- {
- "Id": "wayland-xdg-output-protocol",
- "Name": "Wayland XDG Output Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor API, and the Qt Wayland platform plugin.",
- "Files": "xdg-output-unstable-v1.xml",
-
- "Description": "The XDG Output protocol is an extended way to describe output regions under Wayland",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "unstable v1, version 3",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/unstable/xdg-output/xdg-output-unstable-v1.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2017 Red Hat Inc."
- },
-
- {
- "Id": "wayland-xdg-shell-protocol",
- "Name": "Wayland XDG Shell Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
- "Files": "xdg-shell.xml",
-
- "Description": "The XDG-Shell protocol is an extended way to manage surfaces under Wayland compositors.",
- "Homepage": "https://gitlab.freedesktop.org/wayland/wayland-protocols/",
- "Version": "1.18",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/tree/1.18/",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2008-2013 Kristian Høgsberg\nCopyright © 2013 Rafael Antognolli\nCopyright © 2013 Jasper St. Pierre\nCopyright © 2010-2013 Intel Corporation\nCopyright © 2015-2017 Samsung Electronics Co., Ltd\nCopyright © 2015-2017 Red Hat Inc.\n"
- },
-
- {
- "Id": "wayland-text-input-unstable-v1",
- "Name": "Wayland Text Input Protocol v1",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland platform plugin",
- "Files": "text-input-unstable-v1.xml",
-
- "Description": "Adds support for text input and input methods to applications running on Wayland servers that only support text-input-unstable-v1.",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "unstable v1",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/blob/main/unstable/text-input/text-input-unstable-v1.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2012, 2013 Intel Corporation"
- },
-
- {
- "Id": "wayland-text-input-unstable-v2",
- "Name": "Wayland Text Input Protocol v2",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
- "Files": "text-input-unstable-v2.xml",
-
- "Description": "Adds support for text input and input methods to applications.",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "unstable v2",
- "LicenseId": "HPND",
- "License": "HPND License",
- "LicenseFile": "HPND_LICENSE.txt",
- "Copyright": "Copyright © 2012, 2013 Intel Corporation\nCopyright © 2015, 2016 Jan Arne Petersen"
- },
-
- {
- "Id": "wayland-linux-dmabuf-unstable-v1",
- "Name": "Wayland Linux Dmabuf Unstable V1 Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor",
- "Files": "linux-dmabuf-unstable-v1.xml",
-
- "Description": "The linux dmabuf protocol is a way to create dmabuf-based wl_buffers",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "unstable v1, version 3",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2014, 2015 Collabora, Ltd."
- },
-
- {
- "Id": "wayland-eglstream-controller",
- "Name": "Wayland EGLStream Controller Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor",
- "Files": "wl-eglstream-controller.xml",
-
- "Description": "Allows clients to request that the compositor creates its EGLStream.",
- "Homepage": "https://github.com/NVIDIA/egl-wayland",
- "Version": "1.1.1",
- "DownloadLocation": "https://raw.githubusercontent.com/NVIDIA/egl-wayland/1.1.1/wayland-eglstream/wayland-eglstream-controller.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved."
- },
-
- {
- "Id": "presentation-time.xml",
- "Name": "Presentation Time Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland Compositor",
- "Files": "presentation-time.xml",
-
- "Description": "The presentaton time protocol is a way to get presentation timing feedback.",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "1",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/stable/presentation-time/presentation-time.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2013, 2014 Collabora, Ltd."
- },
-
- {
- "Id": "xdg-foreign-unstable-v2",
- "Name": "Wayland XDG Foreign Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland platform plugin",
- "Files": "xdg-foreign-unstable-v2.xml",
-
- "Description": "Allows referencing surfaces of different clients",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "1",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/raw/1.25/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2015-2016 Red Hat Inc."
- },
-
- {
- "Id": "fractional-scale-v1",
- "Name": "Wayland Fractional Scale Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland platform plugin",
- "Files": "fractional-scale-v1.xml",
-
- "Description": "Send a preferred scale to different clients",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "1",
- "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/raw/1.31/unstable/fractional-scale/fractional-scale-v1.xml",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2022 Kenny Levinsen"
- },
-
- {
- "Id": "xdg-dialog-v1",
- "Name": "Wayland Dialog Protocol",
- "QDocModule": "qtwaylandcompositor",
- "QtUsage": "Used in the Qt Wayland platform plugin",
- "Files": "xdg-dialog-v1.xml",
-
- "Description": "Register toplevel as dialogs",
- "Homepage": "https://wayland.freedesktop.org",
- "Version": "1",
- "DownloadLocation": "",
- "LicenseId": "MIT",
- "License": "MIT License",
- "LicenseFile": "MIT_LICENSE.txt",
- "Copyright": "Copyright © 2023 Carlos Garnacho"
- }
-]
diff --git a/src/3rdparty/wayland/protocols/scaler/qt_attribution.json b/src/3rdparty/wayland/protocols/scaler/qt_attribution.json
new file mode 100644
index 00000000000..4b1f7303b8a
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/scaler/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-scaler-protocol",
+ "Name": "Wayland Scaler Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland Compositor API",
+ "Files": "scaler.xml",
+
+ "Description": "The Wayland scaler extension allows a client to scale or crop a surface without modifying the buffer",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "2",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/weston/raw/1.11/protocol/scaler.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2013-2014 Collabora, Ltd."
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/scaler.xml b/src/3rdparty/wayland/protocols/scaler/scaler.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/scaler.xml
rename to src/3rdparty/wayland/protocols/scaler/scaler.xml
diff --git a/src/3rdparty/wayland/protocols/tablet/qt_attribution.json b/src/3rdparty/wayland/protocols/tablet/qt_attribution.json
new file mode 100644
index 00000000000..150eb2fbc4c
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/tablet/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-tablet-protocol",
+ "Name": "Wayland Tablet Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland platform plugin",
+ "Files": "tablet-unstable-v2.xml",
+
+ "Description": "",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "unstable v2, version 1",
+ "DownloadLocation": "https://cgit.freedesktop.org/wayland/wayland-protocols/plain/unstable/tablet/tablet-unstable-v2.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright 2014 © Stephen \"Lyude\" Chandler Paul\nCopyright 2015-2016 © Red Hat, Inc."
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/tablet-unstable-v2.xml b/src/3rdparty/wayland/protocols/tablet/tablet-unstable-v2.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/tablet-unstable-v2.xml
rename to src/3rdparty/wayland/protocols/tablet/tablet-unstable-v2.xml
diff --git a/src/3rdparty/wayland/protocols/text-input/v1/qt_attribution.json b/src/3rdparty/wayland/protocols/text-input/v1/qt_attribution.json
new file mode 100644
index 00000000000..ea0d59237c2
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/text-input/v1/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-text-input-unstable-v1",
+ "Name": "Wayland Text Input Protocol v1",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland platform plugin",
+ "Files": "text-input-unstable-v1.xml",
+
+ "Description": "Adds support for text input and input methods to applications running on Wayland servers that only support text-input-unstable-v1.",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "unstable v1",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/blob/main/unstable/text-input/text-input-unstable-v1.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2012, 2013 Intel Corporation"
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/text-input-unstable-v1.xml b/src/3rdparty/wayland/protocols/text-input/v1/text-input-unstable-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/text-input-unstable-v1.xml
rename to src/3rdparty/wayland/protocols/text-input/v1/text-input-unstable-v1.xml
diff --git a/src/3rdparty/wayland/protocols/HPND_LICENSE.txt b/src/3rdparty/wayland/protocols/text-input/v2/HPND_LICENSE.txt
similarity index 100%
rename from src/3rdparty/wayland/protocols/HPND_LICENSE.txt
rename to src/3rdparty/wayland/protocols/text-input/v2/HPND_LICENSE.txt
diff --git a/src/3rdparty/wayland/protocols/text-input/v2/qt_attribution.json b/src/3rdparty/wayland/protocols/text-input/v2/qt_attribution.json
new file mode 100644
index 00000000000..f0be562662a
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/text-input/v2/qt_attribution.json
@@ -0,0 +1,17 @@
+[
+ {
+ "Id": "wayland-text-input-unstable-v2",
+ "Name": "Wayland Text Input Protocol v2",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
+ "Files": "text-input-unstable-v2.xml",
+
+ "Description": "Adds support for text input and input methods to applications.",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "unstable v2",
+ "LicenseId": "HPND",
+ "License": "HPND License",
+ "LicenseFile": "HPND_LICENSE.txt",
+ "Copyright": "Copyright © 2012, 2013 Intel Corporation\nCopyright © 2015, 2016 Jan Arne Petersen"
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/text-input-unstable-v2.xml b/src/3rdparty/wayland/protocols/text-input/v2/text-input-unstable-v2.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/text-input-unstable-v2.xml
rename to src/3rdparty/wayland/protocols/text-input/v2/text-input-unstable-v2.xml
diff --git a/src/3rdparty/wayland/protocols/text-input/v3/qt_attribution.json b/src/3rdparty/wayland/protocols/text-input/v3/qt_attribution.json
new file mode 100644
index 00000000000..2a9226e3ea4
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/text-input/v3/qt_attribution.json
@@ -0,0 +1,17 @@
+[
+ {
+ "Id": "wayland-text-input-unstable-v3",
+ "Name": "Wayland Text Input Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
+ "Files": "text-input-unstable-v3.xml",
+ "Description": "Adds support for compositors to act as input methods and send text to applications.",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "unstable v3",
+ "DownloadLocation": "https://cgit.freedesktop.org/wayland/wayland-protocols/plain/unstable/text-input/text-input-unstable-v3.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2012, 2013 Intel Corporation\nCopyright © 2015, 2016 Jan Arne Petersen\nCopyright © 2017, 2018 Red Hat, Inc.\nCopyright © 2018 Purism SPC"
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/text-input-unstable-v3.xml b/src/3rdparty/wayland/protocols/text-input/v3/text-input-unstable-v3.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/text-input-unstable-v3.xml
rename to src/3rdparty/wayland/protocols/text-input/v3/text-input-unstable-v3.xml
diff --git a/src/3rdparty/wayland/protocols/viewporter/qt_attribution.json b/src/3rdparty/wayland/protocols/viewporter/qt_attribution.json
new file mode 100644
index 00000000000..fbdda2c0294
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/viewporter/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-viewporter-protocol",
+ "Name": "Wayland Viewporter Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland Compositor API",
+ "Files": "viewporter.xml",
+
+ "Description": "The Wayland viewporter extension allows a client to scale or crop a surface without modifying the buffer",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "1",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/stable/viewporter/viewporter.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2013-2016 Collabora, Ltd."
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/viewporter.xml b/src/3rdparty/wayland/protocols/viewporter/viewporter.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/viewporter.xml
rename to src/3rdparty/wayland/protocols/viewporter/viewporter.xml
diff --git a/src/3rdparty/wayland/protocols/README b/src/3rdparty/wayland/protocols/wayland/README
similarity index 100%
rename from src/3rdparty/wayland/protocols/README
rename to src/3rdparty/wayland/protocols/wayland/README
diff --git a/src/3rdparty/wayland/protocols/wayland/qt_attribution.json b/src/3rdparty/wayland/protocols/wayland/qt_attribution.json
new file mode 100644
index 00000000000..3624f201288
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/wayland/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-protocol",
+ "Name": "Wayland Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
+ "Files": "wayland.xml",
+
+ "Description": "Wayland is a protocol for a compositor to talk to its clients.",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "1.19.0",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland/raw/1.19.0/protocol/wayland.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2008-2011 Kristian Høgsberg\nCopyright © 2010-2011 Intel Corporation\nCopyright © 2012-2013 Collabora, Ltd."
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/wayland.xml b/src/3rdparty/wayland/protocols/wayland/wayland.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/wayland.xml
rename to src/3rdparty/wayland/protocols/wayland/wayland.xml
diff --git a/src/3rdparty/wayland/protocols/wl-eglstream/qt_attribution.json b/src/3rdparty/wayland/protocols/wl-eglstream/qt_attribution.json
new file mode 100644
index 00000000000..f11023f2681
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/wl-eglstream/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-eglstream-controller",
+ "Name": "Wayland EGLStream Controller Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland Compositor",
+ "Files": "wl-eglstream-controller.xml",
+
+ "Description": "Allows clients to request that the compositor creates its EGLStream.",
+ "Homepage": "https://github.com/NVIDIA/egl-wayland",
+ "Version": "1.1.1",
+ "DownloadLocation": "https://raw.githubusercontent.com/NVIDIA/egl-wayland/1.1.1/wayland-eglstream/wayland-eglstream-controller.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved."
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/wl-eglstream-controller.xml b/src/3rdparty/wayland/protocols/wl-eglstream/wl-eglstream-controller.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/wl-eglstream-controller.xml
rename to src/3rdparty/wayland/protocols/wl-eglstream/wl-eglstream-controller.xml
diff --git a/src/3rdparty/wayland/protocols/wp-primary-selection/qt_attribution.json b/src/3rdparty/wayland/protocols/wp-primary-selection/qt_attribution.json
new file mode 100644
index 00000000000..ab305bb6924
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/wp-primary-selection/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-primary-selection-protocol",
+ "Name": "Wayland Primary Selection Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland platform plugin",
+ "Files": "wp-primary-selection-unstable-v1.xml",
+
+ "Description": "The primary selection extension allows copying text by selecting it and pasting it with the middle mouse button.",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "1",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/unstable/primary-selection/primary-selection-unstable-v1.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2015, 2016 Red Hat"
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/wp-primary-selection-unstable-v1.xml b/src/3rdparty/wayland/protocols/wp-primary-selection/wp-primary-selection-unstable-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/wp-primary-selection-unstable-v1.xml
rename to src/3rdparty/wayland/protocols/wp-primary-selection/wp-primary-selection-unstable-v1.xml
diff --git a/src/3rdparty/wayland/protocols/xdg-activation/qt_attribution.json b/src/3rdparty/wayland/protocols/xdg-activation/qt_attribution.json
new file mode 100644
index 00000000000..1f55ad27b61
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/xdg-activation/qt_attribution.json
@@ -0,0 +1,19 @@
+[
+ {
+ "Id": "wayland-xdg-activation",
+ "Name": "Wayland xdg-activation Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland platform plugin",
+ "Files": "xdg-activation-v1.xml",
+
+ "Description": "The xdg-activation protocol provides a way for one client to pass focus to another.",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "unstable v1, version 1",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/blob/main/staging/xdg-activation/xdg-activation-v1.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2020 Aleix Pol Gonzalez <aleixpol@kde.org>\nCopyright © 2020 Carlos Garnacho <carlosg@gnome.org>"
+
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/xdg-activation-v1.xml b/src/3rdparty/wayland/protocols/xdg-activation/xdg-activation-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/xdg-activation-v1.xml
rename to src/3rdparty/wayland/protocols/xdg-activation/xdg-activation-v1.xml
diff --git a/src/3rdparty/wayland/protocols/xdg-decoration/qt_attribution.json b/src/3rdparty/wayland/protocols/xdg-decoration/qt_attribution.json
new file mode 100644
index 00000000000..7e551a5d200
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/xdg-decoration/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-xdg-decoration-protocol",
+ "Name": "Wayland xdg-decoration Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland Compositor API, and the Qt Wayland platform plugin.",
+ "Files": "xdg-decoration-unstable-v1.xml",
+
+ "Description": "The xdg-decoration protocol allows a compositor to announce support for server-side decorations.",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "unstable v1, version 1",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2018 Simon Ser"
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/xdg-decoration-unstable-v1.xml b/src/3rdparty/wayland/protocols/xdg-decoration/xdg-decoration-unstable-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/xdg-decoration-unstable-v1.xml
rename to src/3rdparty/wayland/protocols/xdg-decoration/xdg-decoration-unstable-v1.xml
diff --git a/src/3rdparty/wayland/protocols/xdg-dialog/qt_attribution.json b/src/3rdparty/wayland/protocols/xdg-dialog/qt_attribution.json
new file mode 100644
index 00000000000..4a6d959e4a1
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/xdg-dialog/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "xdg-dialog-v1",
+ "Name": "Wayland Dialog Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland platform plugin",
+ "Files": "xdg-dialog-v1.xml",
+
+ "Description": "Register toplevel as dialogs",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "1",
+ "DownloadLocation": "",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2023 Carlos Garnacho"
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/xdg-dialog-v1.xml b/src/3rdparty/wayland/protocols/xdg-dialog/xdg-dialog-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/xdg-dialog-v1.xml
rename to src/3rdparty/wayland/protocols/xdg-dialog/xdg-dialog-v1.xml
diff --git a/src/3rdparty/wayland/protocols/xdg-foreign/qt_attribution.json b/src/3rdparty/wayland/protocols/xdg-foreign/qt_attribution.json
new file mode 100644
index 00000000000..00daedd5b95
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/xdg-foreign/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "xdg-foreign-unstable-v2",
+ "Name": "Wayland XDG Foreign Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland platform plugin",
+ "Files": "xdg-foreign-unstable-v2.xml",
+
+ "Description": "Allows referencing surfaces of different clients",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "1",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/raw/1.25/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2015-2016 Red Hat Inc."
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/xdg-foreign-unstable-v2.xml b/src/3rdparty/wayland/protocols/xdg-foreign/xdg-foreign-unstable-v2.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/xdg-foreign-unstable-v2.xml
rename to src/3rdparty/wayland/protocols/xdg-foreign/xdg-foreign-unstable-v2.xml
diff --git a/src/3rdparty/wayland/protocols/xdg-output/qt_attribution.json b/src/3rdparty/wayland/protocols/xdg-output/qt_attribution.json
new file mode 100644
index 00000000000..04c6bf482f5
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/xdg-output/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-xdg-output-protocol",
+ "Name": "Wayland XDG Output Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland Compositor API, and the Qt Wayland platform plugin.",
+ "Files": "xdg-output-unstable-v1.xml",
+
+ "Description": "The XDG Output protocol is an extended way to describe output regions under Wayland",
+ "Homepage": "https://wayland.freedesktop.org",
+ "Version": "unstable v1, version 3",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/raw/1.18/unstable/xdg-output/xdg-output-unstable-v1.xml",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2017 Red Hat Inc."
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/xdg-output-unstable-v1.xml b/src/3rdparty/wayland/protocols/xdg-output/xdg-output-unstable-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/xdg-output-unstable-v1.xml
rename to src/3rdparty/wayland/protocols/xdg-output/xdg-output-unstable-v1.xml
diff --git a/src/3rdparty/wayland/protocols/xdg-shell/qt_attribution.json b/src/3rdparty/wayland/protocols/xdg-shell/qt_attribution.json
new file mode 100644
index 00000000000..b47679c7148
--- /dev/null
+++ b/src/3rdparty/wayland/protocols/xdg-shell/qt_attribution.json
@@ -0,0 +1,18 @@
+[
+ {
+ "Id": "wayland-xdg-shell-protocol",
+ "Name": "Wayland XDG Shell Protocol",
+ "QDocModule": "qtwaylandcompositor",
+ "QtUsage": "Used in the Qt Wayland Compositor, and the Qt Wayland platform plugin.",
+ "Files": "xdg-shell.xml",
+
+ "Description": "The XDG-Shell protocol is an extended way to manage surfaces under Wayland compositors.",
+ "Homepage": "https://gitlab.freedesktop.org/wayland/wayland-protocols/",
+ "Version": "1.18",
+ "DownloadLocation": "https://gitlab.freedesktop.org/wayland/wayland-protocols/tree/1.18/",
+ "LicenseId": "MIT",
+ "License": "MIT License",
+ "LicenseFile": "../MIT_LICENSE.txt",
+ "Copyright": "Copyright © 2008-2013 Kristian Høgsberg\nCopyright © 2013 Rafael Antognolli\nCopyright © 2013 Jasper St. Pierre\nCopyright © 2010-2013 Intel Corporation\nCopyright © 2015-2017 Samsung Electronics Co., Ltd\nCopyright © 2015-2017 Red Hat Inc.\n"
+ }
+]
diff --git a/src/3rdparty/wayland/protocols/xdg-shell-unstable-v6.xml b/src/3rdparty/wayland/protocols/xdg-shell/xdg-shell-unstable-v6.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/xdg-shell-unstable-v6.xml
rename to src/3rdparty/wayland/protocols/xdg-shell/xdg-shell-unstable-v6.xml
diff --git a/src/3rdparty/wayland/protocols/xdg-shell.xml b/src/3rdparty/wayland/protocols/xdg-shell/xdg-shell.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/xdg-shell.xml
rename to src/3rdparty/wayland/protocols/xdg-shell/xdg-shell.xml
diff --git a/src/3rdparty/wayland/protocols/xdg-toplevel-drag-v1.xml b/src/3rdparty/wayland/protocols/xdg-toplevel-drag/xdg-toplevel-drag-v1.xml
similarity index 100%
rename from src/3rdparty/wayland/protocols/xdg-toplevel-drag-v1.xml
rename to src/3rdparty/wayland/protocols/xdg-toplevel-drag/xdg-toplevel-drag-v1.xml
diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt
index 4d0a106f658..6e6890ea858 100644
--- a/src/plugins/platforms/wayland/CMakeLists.txt
+++ b/src/plugins/platforms/wayland/CMakeLists.txt
@@ -82,19 +82,19 @@ qt_internal_add_module(WaylandClient
qt6_generate_wayland_protocol_client_sources(WaylandClient
FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/cursor-shape-v1.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/pointer-gestures-unstable-v1.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/tablet-unstable-v2.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input-unstable-v1.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input-unstable-v2.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input-unstable-v3.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wayland.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wp-primary-selection-unstable-v1.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-output-unstable-v1.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/fractional-scale-v1.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/viewporter.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-shell.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-toplevel-drag-v1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/cursor-shape/cursor-shape-v1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/pointer-gestures/pointer-gestures-unstable-v1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/tablet/tablet-unstable-v2.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input/v1/text-input-unstable-v1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input/v2/text-input-unstable-v2.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input/v3/text-input-unstable-v3.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wayland/wayland.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wp-primary-selection/wp-primary-selection-unstable-v1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-output/xdg-output-unstable-v1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/fractional-scale/fractional-scale-v1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/viewporter/viewporter.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-shell/xdg-shell.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-toplevel-drag/xdg-toplevel-drag-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-key-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-text-input-method-unstable-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-windowmanager.xml
diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt
index 7413bcdf547..e322b5de5d9 100644
--- a/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt
+++ b/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt
@@ -24,7 +24,7 @@ qt_internal_add_plugin(QWaylandFullScreenShellV1IntegrationPlugin
qt6_generate_wayland_protocol_client_sources(QWaylandFullScreenShellV1IntegrationPlugin
FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/fullscreen-shell-unstable-v1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/fullscreen-shell/fullscreen-shell-unstable-v1.xml
)
#### Keys ignored in scope 1:.:.:fullscreen-shell-v1.pro::
diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt
index 09b076d00c3..d55b5cf23ee 100644
--- a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt
+++ b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt
@@ -26,7 +26,7 @@ qt6_generate_wayland_protocol_client_sources(WlShellIntegrationPrivate
# this is just a helper module and still part of the QtWaylandClient build
__QT_INTERNAL_WAYLAND_INCLUDE_DIR QtWaylandClient/private
FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/wayland.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/wayland/wayland.xml
)
#### Keys ignored in scope 2:.:.:wl-shell-integration.pro::
diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt
index af5a97feecd..de53030ed46 100644
--- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt
+++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt
@@ -28,11 +28,11 @@ qt_internal_add_plugin(QWaylandXdgShellIntegrationPlugin
qt6_generate_wayland_protocol_client_sources(QWaylandXdgShellIntegrationPlugin
FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-decoration-unstable-v1.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-shell.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-activation-v1.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-foreign-unstable-v2.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-dialog-v1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-decoration/xdg-decoration-unstable-v1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-shell/xdg-shell.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-activation/xdg-activation-v1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-foreign/xdg-foreign-unstable-v2.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/xdg-dialog/xdg-dialog-v1.xml
)
#### Keys ignored in scope 1:.:.:xdg-shell.pro::
diff --git a/tests/auto/wayland/shared/CMakeLists.txt b/tests/auto/wayland/shared/CMakeLists.txt
index 1d64f2956e0..bb0163e6439 100644
--- a/tests/auto/wayland/shared/CMakeLists.txt
+++ b/tests/auto/wayland/shared/CMakeLists.txt
@@ -41,20 +41,20 @@ add_library(SharedClientTest
qt6_generate_wayland_protocol_server_sources(SharedClientTest
FILES
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/cursor-shape-v1.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/fullscreen-shell-unstable-v1.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/ivi-application.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/wp-primary-selection-unstable-v1.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/tablet-unstable-v2.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/text-input-unstable-v2.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/cursor-shape/cursor-shape-v1.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/fullscreen-shell/fullscreen-shell-unstable-v1.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/ivi/ivi-application.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/wp-primary-selection/wp-primary-selection-unstable-v1.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/tablet/tablet-unstable-v2.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/text-input/v2/text-input-unstable-v2.xml
${PROJECT_SOURCE_DIR}/src/extensions/qt-text-input-method-unstable-v1.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/fractional-scale-v1.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/viewporter.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/wayland.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-decoration-unstable-v1.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-dialog-v1.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-output-unstable-v1.xml
- ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-shell.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/fractional-scale/fractional-scale-v1.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/viewporter/viewporter.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/wayland/wayland.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-decoration/xdg-decoration-unstable-v1.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-dialog/xdg-dialog-v1.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-output/xdg-output-unstable-v1.xml
+ ${PROJECT_SOURCE_DIR}/src/3rdparty/protocol/xdg-shell/xdg-shell.xml
)
if(QT_FEATURE_opengl)
diff --git a/tests/auto/wayland/shared/shared.pri b/tests/auto/wayland/shared/shared.pri
index 97202e78792..e81ad9d4a64 100644
--- a/tests/auto/wayland/shared/shared.pri
+++ b/tests/auto/wayland/shared/shared.pri
@@ -3,10 +3,10 @@ CONFIG += testcase wayland-scanner
QMAKE_USE += wayland-server
WAYLANDSERVERSOURCES += \
- $$PWD/../../../../src/3rdparty/protocol/wayland.xml \
- $$PWD/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml \
- $$PWD/../../../../src/3rdparty/protocol/xdg-shell.xml \
- $$PWD/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
+ $$PWD/../../../../src/3rdparty/protocol/wayland/wayland.xml \
+ $$PWD/../../../../src/3rdparty/protocol/xdg-output/xdg-output-unstable-v1.xml \
+ $$PWD/../../../../src/3rdparty/protocol/xdg-shell/xdg-shell.xml \
+ $$PWD/../../../../src/3rdparty/protocol/text-input/text-input-unstable-v2.xml
INCLUDEPATH += ../shared