diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-09-01 15:17:03 +1000 |
|---|---|---|
| committer | Craig Scott <craig.scott@qt.io> | 2021-09-06 18:45:50 +1000 |
| commit | 5a4fb366d486d8e6de1f2944a2d0a6b0b6893863 (patch) | |
| tree | d746a372e5e0ab5342c094977ac7d8803a1e8d04 | |
| parent | 9e909d35e5f1867551e4dcd9336a81d10607447b (diff) | |
Revert "Ensure versionless wrappers do not introduce a new variable scope"
This reverts commit d7cb318f41686f7a43f67d8af0b0539b9dd8f78c.
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: Ic0df7dc9f9fd2893ed14037ffa0cc4ab57aee4d6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/activeqt/container/Qt6AxContainerMacros.cmake | 4 | ||||
| -rw-r--r-- | src/activeqt/control/Qt6AxServerMacros.cmake | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/activeqt/container/Qt6AxContainerMacros.cmake b/src/activeqt/container/Qt6AxContainerMacros.cmake index 5816b30..7c53c06 100644 --- a/src/activeqt/container/Qt6AxContainerMacros.cmake +++ b/src/activeqt/container/Qt6AxContainerMacros.cmake @@ -94,7 +94,7 @@ C indentifier") endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) - macro(qt_target_typelibs) + function(qt_target_typelibs) qt6_target_typelibs(${ARGV}) - endmacro() + endfunction() endif() diff --git a/src/activeqt/control/Qt6AxServerMacros.cmake b/src/activeqt/control/Qt6AxServerMacros.cmake index 9b50cdc..0e6bcad 100644 --- a/src/activeqt/control/Qt6AxServerMacros.cmake +++ b/src/activeqt/control/Qt6AxServerMacros.cmake @@ -88,13 +88,13 @@ target will be a separate file.\"") endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) - macro(qt_add_axserver_executable) + function(qt_add_axserver_executable) qt6_add_axserver_executable(${ARGV}) - endmacro() - macro(qt_add_axserver_library) + endfunction() + function(qt_add_axserver_library) qt6_add_axserver_library(${ARGV}) - endmacro() - macro(qt_target_idl) + endfunction() + function(qt_target_idl) qt6_target_idl(${ARGV}) - endmacro() + endfunction() endif() |