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

Android: bump Android target API level to 35

Browse Source 
This patch
-updated target API level to 35 into build tools
-updated target API level to 35 in build.gradle files

Task-number: QTBUG-129461
Task-number: QTBUG-130284
Pick-to: 6.9 6.9.0
Change-Id: Iebdc99e6f607352652c3f0022f17de60eae97d58
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Rami Potinkara 2025-02-12 22:10:06 +02:00
parent 1f3c5f8f90
commit 997a1fae98
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtPlatformAndroid.cmake
View File

@ -26,7 +26,7 @@ endif()
# This variable specifies the API level used for building Java code, it can be the same as Qt for
# Android's maximum supported Android version or higher.
if(NOT QT_ANDROID_API_USED_FOR_JAVA)
set(QT_ANDROID_API_USED_FOR_JAVA "android-34")
set(QT_ANDROID_API_USED_FOR_JAVA "android-35")
endif()
set(jar_location "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_USED_FOR_JAVA}/android.jar")

2
mkspecs/android-clang/qmake.conf
View File

@ -44,7 +44,7 @@ isEmpty(ALL_ANDROID_ABIS): ALL_ANDROID_ABIS = arm64-v8a armeabi-v7a x86_64 x86
CONFIG += $$ANDROID_PLATFORM
ANDROID_MIN_SDK_VERSION = $$replace(ANDROID_PLATFORM, "android-", "")
ANDROID_TARGET_SDK_VERSION = 34
ANDROID_TARGET_SDK_VERSION = 35
NDK_LLVM_PATH = $$NDK_ROOT/toolchains/llvm/prebuilt/$$NDK_HOST
QMAKE_CC = $$NDK_LLVM_PATH/bin/clang

2
mkspecs/features/android/sdk.prf
View File

@ -1,6 +1,6 @@
ANDROID_API_USED_FOR_JAVA = $$(ANDROID_API_VERSION)
isEmpty(ANDROID_API_USED_FOR_JAVA): ANDROID_API_USED_FOR_JAVA = $$API_VERSION
isEmpty(ANDROID_API_USED_FOR_JAVA): ANDROID_API_USED_FOR_JAVA = android-34
isEmpty(ANDROID_API_USED_FOR_JAVA): ANDROID_API_USED_FOR_JAVA = android-35
ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$ANDROID_API_USED_FOR_JAVA/android.jar
!exists($$ANDROID_JAR_FILE) {

2
qmake/doc/src/qmake-manual.qdoc
View File

@ -1089,7 +1089,7 @@
\note This variable applies only to Android targets.
Specifies the target Android API level for the project. By default, this
variable is set to API level 34.
variable is set to API level 35.
\section1 ANDROID_VERSION_CODE

2
src/android/jar/build.gradle
View File

@ -23,7 +23,7 @@ repositories {
}
android {
compileSdk 34
compileSdk 35
namespace "org.qtproject.qt.android"
defaultConfig {

2
src/network/android/jar/build.gradle
View File

@ -23,7 +23,7 @@ repositories {
}
android {
compileSdk 34
compileSdk 35
defaultConfig {
minSdkVersion 28

2
src/plugins/networkinformation/android/jar/build.gradle
View File

@ -23,7 +23,7 @@ repositories {
}
android {
compileSdk 34
compileSdk 35
defaultConfig {
minSdkVersion 28

2
src/tools/androiddeployqt/main.cpp
View File

@ -172,7 +172,7 @@ struct Options
QString versionName;
QString versionCode;
QByteArray minSdkVersion{"28"};
QByteArray targetSdkVersion{"34"};
QByteArray targetSdkVersion{"35"};
// lib c++ path
QString stdCppPath;