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

Android: bump Android target API level to 33

Browse Source 
To follow latest Play Store requirement.

Pick-to: 6.6.0 6.5
Fixes: QTBUG-112637
Change-Id: I1ef4f8b639f4b0cc759a2363b7b9b9864b159509
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit b74f180ac065741783dc4e7f793bb97e35aed7f7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia 2023-09-08 15:07:31 +03:00 committed by Qt Cherry-pick Bot
parent e228211f41
commit b33b0b607a
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 CONFIG += $$ANDROID_PLATFORM
ANDROID_MIN_SDK_VERSION = $$replace(ANDROID_PLATFORM, "android-", "") 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 NDK_LLVM_PATH = $$NDK_ROOT/toolchains/llvm/prebuilt/$$NDK_HOST
QMAKE_CC = $$NDK_LLVM_PATH/bin/clang QMAKE_CC = $$NDK_LLVM_PATH/bin/clang

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

@ -1088,7 +1088,7 @@
\note This variable applies only to Android targets. \note This variable applies only to Android targets.
Specifies the target Android API level for the project. By default, this 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 \section1 ANDROID_VERSION_CODE

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

@ -23,12 +23,12 @@ repositories {
} }
android { android {
compileSdkVersion 31 compileSdkVersion 33
buildToolsVersion "31.0.3" buildToolsVersion "33.0.3"
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 31 targetSdkVersion 33
} }
sourceSets { sourceSets {

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

@ -23,12 +23,12 @@ repositories {
} }
android { android {
compileSdkVersion 31 compileSdkVersion 33
buildToolsVersion "31.0.3" buildToolsVersion "33.0.3"
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 31 targetSdkVersion 33
} }
sourceSets { sourceSets {

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

@ -23,12 +23,12 @@ repositories {
} }
android { android {
compileSdkVersion 31 compileSdkVersion 33
buildToolsVersion "31.0.3" buildToolsVersion "33.0.3"
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 31 targetSdkVersion 33
} }
sourceSets { sourceSets {

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

@ -163,7 +163,7 @@ struct Options
QString versionName; QString versionName;
QString versionCode; QString versionCode;
QByteArray minSdkVersion{"23"}; QByteArray minSdkVersion{"23"};
QByteArray targetSdkVersion{"31"}; QByteArray targetSdkVersion{"33"};
// lib c++ path // lib c++ path
QString stdCppPath; QString stdCppPath;