summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSheree Morphett <[email protected]>2025-06-16 15:39:05 +0300
committerAssam Boudjelthia <[email protected]>2025-07-03 19:04:44 +0000
commit8d07e721eebfd8d7ef40f46ce4680effa3291e98 (patch)
treeab6aa041b0f7e59ce29ae32418601914c4edabbe
parentbddc78c796dd9e4dd843578e77ee325b9e10a055 (diff)
CMake:Android: add ANDROID_PLATFORM to Core.jsonHEADdev
Add ANDROID_PLATFORM to Core.json so that Qt Creator can pick it up. Task-number: QTCREATORBUG-32932 Pick-to: 6.10 6.9 6.8 Change-Id: I4a84ba74f43d68e2aef6c31f93c8c94a46bd406a Reviewed-by: Assam Boudjelthia <[email protected]>
-rw-r--r--cmake/QtModuleHelpers.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake
index ecfdb740d71..f7ab67455ce 100644
--- a/cmake/QtModuleHelpers.cmake
+++ b/cmake/QtModuleHelpers.cmake
@@ -1554,8 +1554,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")