summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRami Potinkara <[email protected]>2025-02-12 22:10:06 +0200
committerRami Potinkara <[email protected]>2025-03-06 18:43:38 +0000
commit997a1fae98d35cd0d4d16f37ab68afe2729ff551 (patch)
treef54b2f2c1ee37867488bdf6fd9a234f234709fcd
parent1f3c5f8f9025057f9a7f6b6143f33a529583ab19 (diff)
Android: bump Android target API level to 35
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 <[email protected]>
-rw-r--r--cmake/QtPlatformAndroid.cmake2
-rw-r--r--mkspecs/android-clang/qmake.conf2
-rw-r--r--mkspecs/features/android/sdk.prf2
-rw-r--r--qmake/doc/src/qmake-manual.qdoc2
-rw-r--r--src/android/jar/build.gradle2
-rw-r--r--src/network/android/jar/build.gradle2
-rw-r--r--src/plugins/networkinformation/android/jar/build.gradle2
-rw-r--r--src/tools/androiddeployqt/main.cpp2
8 files changed, 8 insertions, 8 deletions
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake
index 430f5e61f20..1ded0197205 100644
--- a/cmake/QtPlatformAndroid.cmake
+++ b/cmake/QtPlatformAndroid.cmake
@@ -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")
diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf
index 031e97a808b..dd3b6a1d88c 100644
--- a/mkspecs/android-clang/qmake.conf
+++ b/mkspecs/android-clang/qmake.conf
@@ -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
diff --git a/mkspecs/features/android/sdk.prf b/mkspecs/features/android/sdk.prf
index b1395994037..6fd1d666e02 100644
--- a/mkspecs/features/android/sdk.prf
+++ b/mkspecs/features/android/sdk.prf
@@ -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) {
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
index fc893891f7c..a6a09d91878 100644
--- a/qmake/doc/src/qmake-manual.qdoc
+++ b/qmake/doc/src/qmake-manual.qdoc
@@ -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
diff --git a/src/android/jar/build.gradle b/src/android/jar/build.gradle
index 9e659f6a5b9..3085db75bc1 100644
--- a/src/android/jar/build.gradle
+++ b/src/android/jar/build.gradle
@@ -23,7 +23,7 @@ repositories {
}
android {
- compileSdk 34
+ compileSdk 35
namespace "org.qtproject.qt.android"
defaultConfig {
diff --git a/src/network/android/jar/build.gradle b/src/network/android/jar/build.gradle
index 0ae63a3bcd8..73658c68b12 100644
--- a/src/network/android/jar/build.gradle
+++ b/src/network/android/jar/build.gradle
@@ -23,7 +23,7 @@ repositories {
}
android {
- compileSdk 34
+ compileSdk 35
defaultConfig {
minSdkVersion 28
diff --git a/src/plugins/networkinformation/android/jar/build.gradle b/src/plugins/networkinformation/android/jar/build.gradle
index 0ae63a3bcd8..73658c68b12 100644
--- a/src/plugins/networkinformation/android/jar/build.gradle
+++ b/src/plugins/networkinformation/android/jar/build.gradle
@@ -23,7 +23,7 @@ repositories {
}
android {
- compileSdk 34
+ compileSdk 35
defaultConfig {
minSdkVersion 28
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 5b7153da52c..0eb83cc3486 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -172,7 +172,7 @@ struct Options
QString versionName;
QString versionCode;
QByteArray minSdkVersion{"28"};
- QByteArray targetSdkVersion{"34"};
+ QByteArray targetSdkVersion{"35"};
// lib c++ path
QString stdCppPath;