diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-02-25 12:33:15 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-02 09:24:03 +0000 |
| commit | 3c347c1926965fbc03de9e39fa1307ed04f9823a (patch) | |
| tree | 81403ebd7af3a24d8c1e53bc1c6e792155127797 /cmake | |
| parent | 98060a4acbf68d1253ec11f4497fb9ef8e17abb0 (diff) | |
Add the _qt_internal_android_executable_finalizer wrapper function
_qt_internal_android_executable_finalizer wraps Android-related
function that are needed to created an Android package.
The function is added to the INTERFACE_QT_EXECUTABLE_FINALIZERS
property in Qt Core so it's called implicitly for user projects.
Change-Id: I140f53341691dcfdc6ae2ddea520818cf2834eb6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit e7586119e1ba48844a9353e5b9cb6f0f26292764)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtExecutableHelpers.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index a7f7678e9e..f70adad11a 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -20,10 +20,8 @@ function(qt_internal_add_executable name) endif() _qt_internal_create_executable(${name}) - if (ANDROID) - _qt_internal_configure_android_multiabi_target("${name}") - qt_android_generate_deployment_settings("${name}") - qt_android_add_apk_target("${name}") + if(ANDROID) + _qt_internal_android_executable_finalizer(${name}) endif() if(arg_QT_APP AND QT_FEATURE_debug_and_release AND CMAKE_VERSION VERSION_GREATER_EQUAL "3.19.0") |