diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-01 10:58:02 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-01 14:57:12 +0200 |
commit | 081ec14b256613e30837ebc6b2a0cf7919d2dc20 (patch) | |
tree | 539dac166ca7311556bf91e16dbfe4a8ec9ba9b3 /src/corelib/Qt6AndroidMacros.cmake | |
parent | 84485dfad301af433da6a8377afbafcf228b43d2 (diff) |
CMake: Clean up the public API a bit
Add some missing versionless functions.
Rename some functions that are not meant to be public API, and their
usages.
Task-number: QTBUG-86827
Change-Id: Ifb66c04cd7598d83fe80c01a92ab2d269ebaf396
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib/Qt6AndroidMacros.cmake')
-rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 3f02661e18..aa9ac9104a 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -13,11 +13,16 @@ function(qt6_android_get_sdk_build_tools_revision out_var) list(SORT android_build_tools) list(REVERSE android_build_tools) list(GET android_build_tools 0 android_build_tools_latest) - set(QT_ANDROID_SDK_BUILD_TOOLS_REVISION ${android_build_tools_latest}) endif() - set(${out_var} "${QT_ANDROID_SDK_BUILD_TOOLS_REVISION}" PARENT_SCOPE) + set(${out_var} "${android_build_tools_latest}" PARENT_SCOPE) endfunction() +if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) + function(qt_android_get_sdk_build_tools_revision) + qt6_android_get_sdk_build_tools_revision(${ARGV}) + endfunction() +endif() + # Generate the deployment settings json file for a cmake target. function(qt6_android_generate_deployment_settings target) # Information extracted from mkspecs/features/android/android_deployment_settings.prf |