From 7918d0699c5de7b96a85e456d9dc1b587703fb94 Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Thu, 13 Feb 2025 11:50:29 +0200 Subject: [PATCH] Android: update Android 15 SDK 35 to docs This patch updates the macros for Android maxApiVer, AndroidMaxVer, AndroidPlatformVer, AndroidBuildToolsVer variables to reflect Android 15 Task-number: QTBUG-129462 Pick-to: 6.8 6.5 Change-Id: Ia6edfa7811dd8c98a0a99c10d8781aa09384bdfa Reviewed-by: Assam Boudjelthia Reviewed-by: Nicholas Bennett (cherry picked from commit 9b475eadfcf04194a094454f65295c3a456000a4) Reviewed-by: Qt Cherry-pick Bot --- doc/global/macros.qdocconf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index 1d10b1e4fbd..68d67509475 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -90,11 +90,11 @@ macro.NdkFullVer = "26.1.10909125" macro.NdkCompilerVer = "Clang 17.0.2" macro.JdkVer = "17" macro.AndroidMinApiVer = "28" -macro.AndroidMaxApiVer = "34" +macro.AndroidMaxApiVer = "35" macro.AndroidMinVer = "9" -macro.AndroidMaxVer = "14" -macro.AndroidPlatformVer = "34" -macro.AndroidBuildToolsVer = "34.0.0" +macro.AndroidMaxVer = "15" +macro.AndroidPlatformVer = "35" +macro.AndroidBuildToolsVer = "35.0.0" macro.GradleVer = "8.10" macro.AGPVer = "8.6.0" macro.AAOSVer = "10 to 13"