diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-10-03 14:11:01 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-10-04 21:17:07 +0300 |
| commit | 2028b80b6b1fa726f428378d2cabfd01ddc2521d (patch) | |
| tree | 14a348fb707a4adf4d226182872fd49a3122f91d /src | |
| parent | ae10084ef9d9db5f32cc9d42ab7e485d0a896d78 (diff) | |
CMake: Allow providing custom QT_ANDROID_SDK_BUILD_TOOLS_REVISION
The current CMake configuration sets QT_ANDROID_SDK_BUILD_TOOLS_REVISION
only internally, taking the latest build-tools found. A project might
still want to manually set specific build-tools version.
Pick-to: 6.2
Task-number: QTBUG-97002
Change-Id: I553563638160fdef7a27b9b334d1d9aae5d8b7e1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index ddcc184677..99c41fc733 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -98,9 +98,12 @@ function(qt6_android_generate_deployment_settings target) " \"sdk\": \"${android_sdk_root_native}\",\n") # Android SDK Build Tools Revision - _qt_internal_android_get_sdk_build_tools_revision(QT_ANDROID_SDK_BUILD_TOOLS_REVISION) + get_target_property(android_sdk_build_tools ${target} QT_ANDROID_SDK_BUILD_TOOLS_REVISION) + if (NOT android_sdk_build_tools) + _qt_internal_android_get_sdk_build_tools_revision(android_sdk_build_tools) + endif() string(APPEND file_contents - " \"sdkBuildToolsRevision\": \"${QT_ANDROID_SDK_BUILD_TOOLS_REVISION}\",\n") + " \"sdkBuildToolsRevision\": \"${android_sdk_build_tools}\",\n") # Android NDK file(TO_CMAKE_PATH "${CMAKE_ANDROID_NDK}" android_ndk_root_native) |