summaryrefslogtreecommitdiffstats
path: root/src/corelib/Qt6AndroidMacros.cmake
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@qt.io>2021-08-31 15:56:00 +1000
committerCraig Scott <craig.scott@qt.io>2021-09-06 23:56:28 +1000
commita37789e4931a85fce4fba9c9612ebb4020572d54 (patch)
treea840bb5eb7bfedf95b6767ec01d4f50079be4e7f /src/corelib/Qt6AndroidMacros.cmake
parent9877d55a50db45f7c629f2172dd848ef07e9fabe (diff)
Revert "Ensure versionless wrappers do not introduce a new variable scope"
This reverts commit 08180e76e6116f0ef66476ca00b2b676b3aa50da. 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: Ic5dcff3081123d957888584ba1d76ae0580d9083 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib/Qt6AndroidMacros.cmake')
-rw-r--r--src/corelib/Qt6AndroidMacros.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake
index 9b68d57001..c5f04c49bc 100644
--- a/src/corelib/Qt6AndroidMacros.cmake
+++ b/src/corelib/Qt6AndroidMacros.cmake
@@ -262,9 +262,9 @@ function(qt6_android_generate_deployment_settings target)
endfunction()
if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
- macro(qt_android_generate_deployment_settings)
+ function(qt_android_generate_deployment_settings)
qt6_android_generate_deployment_settings(${ARGV})
- endmacro()
+ endfunction()
endif()
function(qt6_android_apply_arch_suffix target)
@@ -277,9 +277,9 @@ function(qt6_android_apply_arch_suffix target)
endfunction()
if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
- macro(qt_android_apply_arch_suffix)
+ function(qt_android_apply_arch_suffix)
qt6_android_apply_arch_suffix(${ARGV})
- endmacro()
+ endfunction()
endif()
# Add custom target to package the APK
@@ -397,7 +397,7 @@ function(_qt_internal_create_global_apk_all_target_if_needed)
endfunction()
if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
- macro(qt_android_add_apk_target)
+ function(qt_android_add_apk_target)
qt6_android_add_apk_target(${ARGV})
- endmacro()
+ endfunction()
endif()