From 0815723d6dc754045651e2e33030ac0350d97104 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Tue, 7 Jul 2020 15:07:24 +0200 Subject: [PATCH] Stop using deprecated wayland-scanner argument The argument "code" is deprecated. Use "public-code" instead. Task-number: QTBUG-73099 Change-Id: Idc8dca127581e07b81d7174ece3312c27b6ba9db Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake | 2 +- src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake b/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake index 6624c84f26e..f81812d2df5 100644 --- a/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake +++ b/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake @@ -19,7 +19,7 @@ function(qt6_generate_wayland_protocol_client_sources target) add_custom_command( OUTPUT "${waylandscanner_code_output}" - COMMAND Wayland::Scanner --include-core-only code < "${protocol_file}" > "${waylandscanner_code_output}" + COMMAND Wayland::Scanner --include-core-only public-code < "${protocol_file}" > "${waylandscanner_code_output}" ) # TODO: Make this less hacky diff --git a/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake b/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake index 15444e6cc69..0a1241a6d04 100644 --- a/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake +++ b/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake @@ -17,7 +17,7 @@ function(qt6_generate_wayland_protocol_server_sources target) ) add_custom_command( OUTPUT "${waylandscanner_code_output}" - COMMAND Wayland::Scanner --include-core-only code < "${protocol_file}" > "${waylandscanner_code_output}" + COMMAND Wayland::Scanner --include-core-only public-code < "${protocol_file}" > "${waylandscanner_code_output}" ) # TODO: make this less hacky