diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-09-01 14:19:37 +1000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-06 09:23:37 +0000 |
| commit | 67e730f2b033ad357ea5a80416a9703358b19e81 (patch) | |
| tree | a30a98e3db735c31d0f243d3900182c7a7fa4305 | |
| parent | 814a73100a17c6f737e7d82a7660be12064044a3 (diff) | |
Revert "Ensure versionless wrappers do not introduce a new variable scope"
This reverts commit 0d995353419ec4908a322ebae7b5797b8c758688.
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: I4d0ddf035629651ba7048c1619a2833f03c7b756
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 3923c266bcd6e320b74c1aac37576d8a91f56125)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/scxml/Qt6ScxmlMacros.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/scxml/Qt6ScxmlMacros.cmake b/src/scxml/Qt6ScxmlMacros.cmake index b4a5a5f..f78155c 100644 --- a/src/scxml/Qt6ScxmlMacros.cmake +++ b/src/scxml/Qt6ScxmlMacros.cmake @@ -97,11 +97,12 @@ function(qt6_add_statecharts target_or_outfiles) endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) - macro(qt_add_statecharts) + function(qt_add_statecharts outfiles) if(QT_DEFAULT_MAJOR_VERSION EQUAL 5) - qt5_add_statecharts(${ARGV}) + qt5_add_statecharts("${outfiles}" ${ARGN}) elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6) - qt6_add_statecharts(${ARGV}) + qt6_add_statecharts("${outfiles}" ${ARGN}) endif() - endmacro() + set("${outfiles}" "${${outfiles}}" PARENT_SCOPE) + endfunction() endif() |