From 66cbac0b30bd25a91caee1a38e9f946e90bfc007 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Wed, 1 Sep 2021 14:35:15 +1000 Subject: [PATCH] Revert "Ensure versionless wrappers do not introduce a new variable scope" This reverts commit 0402f082db34577c4ef38b8d4a7ae0ac2436568e. Macros add another level of escaping that functions do not. The conversion of the versionless wrappers to macros may alter the behavior, so revert that change. Task-number: QTBUG-96219 Pick-to: 6.2 Change-Id: I75d7223477894fd28c261ffb8476ab64f5b7d9be Reviewed-by: Joerg Bornemann --- src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake | 4 ++-- src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake b/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake index f618f3ddcfd..c810325955e 100644 --- a/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake +++ b/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake @@ -82,7 +82,7 @@ function(qt6_generate_wayland_protocol_client_sources target) endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) - macro(qt_generate_wayland_protocol_client_sources) + function(qt_generate_wayland_protocol_client_sources) qt6_generate_wayland_protocol_client_sources(${ARGV}) - endmacro() + endfunction() endif() diff --git a/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake b/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake index 6953be7de55..92ad04696b4 100644 --- a/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake +++ b/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake @@ -66,7 +66,7 @@ function(qt6_generate_wayland_protocol_server_sources target) endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) - macro(qt_generate_wayland_protocol_server_sources) + function(qt_generate_wayland_protocol_server_sources) qt6_generate_wayland_protocol_server_sources(${ARGV}) - endmacro() + endfunction() endif()