AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Android default SDK from 29 to 30

Browse Source 
By the time of Qt 6.2 release all new apps targeting Play store must
target API level 30 (Android 11) or above (starting in 08/2021 for
new apps and 11/2021 for existing apps' updates).

Pick-to: 6.2 5.15
Task-number: QTBUG-94451
Change-Id: Id7fa2fd62899a7259e365c917292c6c3ac0d2b0d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Juha Vuolle 2021-06-12 20:42:08 +03:00 committed by Assam Boudjelthia
parent 1bdc35bfe0
commit 17d7a8dc2e
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtPlatformAndroid.cmake
View File

@ -33,7 +33,7 @@ function(qt_get_android_sdk_jar_for_api api out_jar_location)
endfunction() endfunction()
# Minimum recommend android SDK api version # Minimum recommend android SDK api version
set(QT_ANDROID_API_VERSION "android-29") set(QT_ANDROID_API_VERSION "android-30")
# Locate android.jar # Locate android.jar
set(QT_ANDROID_JAR "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_VERSION}/android.jar") set(QT_ANDROID_JAR "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_VERSION}/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 CONFIG += $$ANDROID_PLATFORM
ANDROID_MIN_SDK_VERSION = $$replace(ANDROID_PLATFORM, "android-", "") ANDROID_MIN_SDK_VERSION = $$replace(ANDROID_PLATFORM, "android-", "")
ANDROID_TARGET_SDK_VERSION = 29 ANDROID_TARGET_SDK_VERSION = 30
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
mkspecs/features/android/sdk.prf
View File

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

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

@ -1129,7 +1129,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 29. variable is set to API level 30.
\target ANDROID_VERSION_CODE \target ANDROID_VERSION_CODE
\section1 ANDROID_VERSION_CODE \section1 ANDROID_VERSION_CODE

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

@ -182,7 +182,7 @@ struct Options
QString versionName; QString versionName;
QString versionCode; QString versionCode;
QByteArray minSdkVersion{"23"}; QByteArray minSdkVersion{"23"};
QByteArray targetSdkVersion{"29"}; QByteArray targetSdkVersion{"30"};
// lib c++ path // lib c++ path
QString stdCppPath; QString stdCppPath;