diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-09-01 14:35:15 +1000 |
|---|---|---|
| committer | Craig Scott <craig.scott@qt.io> | 2021-09-06 18:48:28 +1000 |
| commit | f796ac5e508c7bc9841b9946b7fafd918878b6d3 (patch) | |
| tree | 46b3971cde7fa12693dd61902997c76ceae4c64e | |
| parent | da22eda0fa0d6bf09191c8b7111194335401cbda (diff) | |
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
Pick-to: 6.2
Change-Id: I75d7223477894fd28c261ffb8476ab64f5b7d9be
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -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 f618f3ddc..c81032595 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 6953be7de..92ad04696 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() |