Skip to content

Commit

Permalink
Android: bump Android target API level to 33
Browse files Browse the repository at this point in the history
To follow latest Play Store requirement.

Pick-to: 6.6.0 6.6 6.5
Fixes: QTBUG-112637
Change-Id: I1ef4f8b639f4b0cc759a2363b7b9b9864b159509
Reviewed-by: Ville Voutilainen <[email protected]>
  • Loading branch information
Issam-b committed Sep 23, 2023
1 parent 3d027f8 commit b74f180
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion mkspecs/android-clang/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 31
ANDROID_TARGET_SDK_VERSION = 33

NDK_LLVM_PATH = $$NDK_ROOT/toolchains/llvm/prebuilt/$$NDK_HOST
QMAKE_CC = $$NDK_LLVM_PATH/bin/clang
Expand Down
2 changes: 1 addition & 1 deletion qmake/doc/src/qmake-manual.qdoc
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,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 31.
variable is set to API level 33.

\section1 ANDROID_VERSION_CODE

Expand Down
6 changes: 3 additions & 3 deletions src/android/jar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ repositories {
}

android {
compileSdkVersion 31
buildToolsVersion "31.0.3"
compileSdkVersion 33
buildToolsVersion "33.0.3"

defaultConfig {
minSdkVersion 23
targetSdkVersion 31
targetSdkVersion 33
}

sourceSets {
Expand Down
6 changes: 3 additions & 3 deletions src/network/android/jar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ repositories {
}

android {
compileSdkVersion 31
buildToolsVersion "31.0.3"
compileSdkVersion 33
buildToolsVersion "33.0.3"

defaultConfig {
minSdkVersion 23
targetSdkVersion 31
targetSdkVersion 33
}

sourceSets {
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/networkinformation/android/jar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ repositories {
}

android {
compileSdkVersion 31
buildToolsVersion "31.0.3"
compileSdkVersion 33
buildToolsVersion "33.0.3"

defaultConfig {
minSdkVersion 23
targetSdkVersion 31
targetSdkVersion 33
}

sourceSets {
Expand Down
2 changes: 1 addition & 1 deletion src/tools/androiddeployqt/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ struct Options
QString versionName;
QString versionCode;
QByteArray minSdkVersion{"23"};
QByteArray targetSdkVersion{"31"};
QByteArray targetSdkVersion{"33"};

// lib c++ path
QString stdCppPath;
Expand Down

0 comments on commit b74f180

Please sign in to comment.