1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Ensure versionless wrappers do not introduce a new variable scope"

Browse Source 
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 <joerg.bornemann@qt.io>
This commit is contained in:
Craig Scott 2021-09-01 14:35:15 +10:00
parent 0402f082db
commit 66cbac0b30
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake
View File

@ -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()

4
src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake
View File

@ -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()