diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-09-01 14:35:15 +1000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-06 09:13:47 +0000 |
| commit | 764bd1fd91e801f1aeb6b3992c06983063471c89 (patch) | |
| tree | 58c027138cea11d5ca9759ae44eda771849a0169 | |
| parent | 04a52f48a8aa402c1a494030462cd70bdb9b0291 (diff) | |
| download | qtwayland-764bd1fd91e801f1aeb6b3992c06983063471c89.tar.gz | |
Revert "Ensure versionless wrappers do not introduce a new variable scope"
This reverts commit 1998283f61e76928063dd46d7dfc0d2759d02855.
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
Change-Id: I75d7223477894fd28c261ffb8476ab64f5b7d9be
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit f796ac5e508c7bc9841b9946b7fafd918878b6d3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/client/Qt6WaylandClientMacros.cmake | 4 | ||||
| -rw-r--r-- | src/compositor/Qt6WaylandCompositorMacros.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client/Qt6WaylandClientMacros.cmake b/src/client/Qt6WaylandClientMacros.cmake index 0834e880..879841a0 100644 --- a/src/client/Qt6WaylandClientMacros.cmake +++ b/src/client/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/compositor/Qt6WaylandCompositorMacros.cmake b/src/compositor/Qt6WaylandCompositorMacros.cmake index 0522f658..a9e79ce4 100644 --- a/src/compositor/Qt6WaylandCompositorMacros.cmake +++ b/src/compositor/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() |