diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-14 13:20:55 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-16 13:53:04 +0200 |
| commit | 1f9ec097b2171f9773b8285c67a2f852d680a73a (patch) | |
| tree | a6d9958b227b4dd74c0ba5c0101127be037ed83a /src/corelib/Qt6AndroidMacros.cmake | |
| parent | d72ff6ffd0e6f04dcd614b020f9abbe129615f8c (diff) | |
CMake: Rename some public API functions
Some of them have a different (hopefully better) name now.
Some are marked as Technical Preview.
Some are renamed to be internal.
Marking add_qt_gui_executable as TP with the intention to un-TP it
after we rename it and change its behavior as discussed in the API
review meeting.
Additional changes to add_qt_gui_executable and qt6_add_resources have
been filed as separate tasks that will be worked on separately.
See comments on PS1 for details.
Task-number: QTBUG-86827
Change-Id: I56a84a1943b0902bb807310dc620eb381824e8dd
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib/Qt6AndroidMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index e3ed88ff24..499fd16c0b 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -1,7 +1,7 @@ # Generate deployment tool json # Locate newest Android sdk build tools revision -function(qt6_android_get_sdk_build_tools_revision out_var) +function(_qt_internal_android_get_sdk_build_tools_revision out_var) if (NOT QT_ANDROID_SDK_BUILD_TOOLS_REVISION) file(GLOB android_build_tools LIST_DIRECTORIES true @@ -17,12 +17,6 @@ function(qt6_android_get_sdk_build_tools_revision out_var) 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 @@ -84,7 +78,7 @@ Please recheck your build configuration.") " \"sdk\": \"${android_sdk_root_native}\",\n") # Android SDK Build Tools Revision - qt6_android_get_sdk_build_tools_revision(QT_ANDROID_SDK_BUILD_TOOLS_REVISION) + _qt_internal_android_get_sdk_build_tools_revision(QT_ANDROID_SDK_BUILD_TOOLS_REVISION) string(APPEND file_contents " \"sdkBuildToolsRevision\": \"${QT_ANDROID_SDK_BUILD_TOOLS_REVISION}\",\n") |