diff options
| -rw-r--r-- | cmake/QtPlatformAndroid.cmake | 2 | ||||
| -rw-r--r-- | mkspecs/android-clang/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/android/sdk.prf | 2 | ||||
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 2 | ||||
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index 0cd2b127c8..90e6478707 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -33,7 +33,7 @@ function(qt_get_android_sdk_jar_for_api api out_jar_location) endfunction() # Minimum recommend android SDK api version -set(QT_ANDROID_API_VERSION "android-29") +set(QT_ANDROID_API_VERSION "android-30") # Locate android.jar set(QT_ANDROID_JAR "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_VERSION}/android.jar") diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf index 2ee64f3e2a..7f23b68f4d 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 = 29 +ANDROID_TARGET_SDK_VERSION = 30 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 cb439ecc37..b8df6dc1c6 100644 --- a/mkspecs/features/android/sdk.prf +++ b/mkspecs/features/android/sdk.prf @@ -1,6 +1,6 @@ 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 = 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 !exists($$ANDROID_JAR_FILE) { diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 7126cfcec0..e0db0a2270 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1129,7 +1129,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 29. + variable is set to API level 30. \target ANDROID_VERSION_CODE \section1 ANDROID_VERSION_CODE diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index b4771c8f95..6bf19ea1a8 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -182,7 +182,7 @@ struct Options QString versionName; QString versionCode; QByteArray minSdkVersion{"23"}; - QByteArray targetSdkVersion{"29"}; + QByteArray targetSdkVersion{"30"}; // lib c++ path QString stdCppPath; |