1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate QT_USE_TARGET_ANDROID_BUILD_DIR value to ABI-specific projects

Browse Source 
The android multi-ABI builds should consider the
QT_USE_TARGET_ANDROID_BUILD_DIR value too. Propagate the value to
the ABI-specific projects when building Android applications.

Fixes: QTBUG-126678
Pick-to: 6.7 6.5
Change-Id: Ifada0d1be7b4f11a82758ba0ee6f69051a2d53d5
Reviewed-by: Tero Koponen <tero.koponen@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 1313c5d3601b47d010eea28d6b104538974d212e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2024-06-26 14:24:36 +02:00 committed by Qt Cherry-pick Bot
parent a02c49f3de
commit ea9df2d8df
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/Qt6AndroidMacros.cmake
View File

@ -1426,6 +1426,11 @@ function(_qt_internal_configure_android_multiabi_target target)
"-DCMAKE_CXX_COMPILER_LAUNCHER=${compiler_launcher}")
endif()
if(DEFINED QT_USE_TARGET_ANDROID_BUILD_DIR)
list(APPEND extra_cmake_args
"-DQT_USE_TARGET_ANDROID_BUILD_DIR=${QT_USE_TARGET_ANDROID_BUILD_DIR}")
endif()
unset(user_cmake_args)
foreach(var IN LISTS QT_ANDROID_MULTI_ABI_FORWARD_VARS)
string(REPLACE ";" "$<SEMICOLON>" var_value "${${var}}")