qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake:Android: add ANDROID_PLATFORM to Core.json 

Add ANDROID_PLATFORM to Core.json so that Qt Creator can pick it up.

Task-number: QTCREATORBUG-32932
Pick-to: 6.8
Change-Id: I4a84ba74f43d68e2aef6c31f93c8c94a46bd406a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 8d07e721ee)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 168524ed5a)
This commit is contained in:
Sheree Morphett 2025-06-16 15:39:05 +03:00 committed by Assam Boudjelthia
parent fb32238df8
commit 17868a8e76
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/QtModuleHelpers.cmake
View File

@ -1445,8 +1445,9 @@ function(qt_describe_module target)
endif()
if(ANDROID)
string(APPEND targets_information
"${indent5}\"api_version\": \"${QT_ANDROID_API_USED_FOR_JAVA}\",
${indent5}\"ndk_version\": \"${ANDROID_NDK_REVISION}\",\n")
"${indent5}\"api_version\": \"${QT_ANDROID_API_USED_FOR_JAVA}\",\n"
"${indent5}\"ndk_version\": \"${ANDROID_NDK_REVISION}\",\n"
"${indent5}\"android_platform\": \"${ANDROID_PLATFORM}\",\n")
endif()
string(APPEND targets_information "${indent5}\"architecture\": \"${architecture}\",\n")
string(APPEND targets_information "${indent5}\"abi\": \"${TEST_arch_${architecture}_abi}\"\n")