diff options
| author | David Edmundson <davidedmundson@kde.org> | 2023-05-31 12:41:42 +0100 |
|---|---|---|
| committer | David Edmundson <davidedmundson@kde.org> | 2023-06-01 13:14:56 +0000 |
| commit | d99465c94f0653573f891356c0368f76cb110ccc (patch) | |
| tree | 7342f83d393f910f74d1b7a9bff97764311cdd2a /src/compositor | |
| parent | 1a36613c78f0036d84f3681ee4b0cca2b9944f4f (diff) | |
Update wayland protocol XML to version 1.22.0
This updates only the protocol definition, implementations
will need additional commits to opt into using them.
The upstream XML specification changed in a way that requires newer
libwayland to generate without warnings in strict mode. To support older
setups the strict argument to wayland-scanner has been removed.
Change-Id: I265a9e208bbf107895b493b952d65f6178ac76e7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/Qt6WaylandCompositorMacros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/Qt6WaylandCompositorMacros.cmake b/src/compositor/Qt6WaylandCompositorMacros.cmake index 3221f815b..05d16af6c 100644 --- a/src/compositor/Qt6WaylandCompositorMacros.cmake +++ b/src/compositor/Qt6WaylandCompositorMacros.cmake @@ -33,12 +33,12 @@ function(qt6_generate_wayland_protocol_server_sources target) add_custom_command( OUTPUT "${waylandscanner_header_output}" #TODO: Maybe put the files in ${CMAKE_CURRENT_BINARY_DIR/wayland_generated instead? - COMMAND Wayland::Scanner --strict --include-core-only server-header < "${protocol_file}" > "${waylandscanner_header_output}" + COMMAND Wayland::Scanner --include-core-only server-header < "${protocol_file}" > "${waylandscanner_header_output}" DEPENDS ${protocol_file} Wayland::Scanner ) add_custom_command( OUTPUT "${waylandscanner_code_output}" - COMMAND Wayland::Scanner --strict --include-core-only public-code < "${protocol_file}" > "${waylandscanner_code_output}" + COMMAND Wayland::Scanner --include-core-only public-code < "${protocol_file}" > "${waylandscanner_code_output}" DEPENDS ${protocol_file} Wayland::Scanner ) |