From e6e8c59485b8ba8dda9b6bfd203fb1c68f1c2e47 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 10 Nov 2021 12:29:40 +0200 Subject: [PATCH] Android: bump default QT_ANDROID_API_VERSION to 31 To allow using Android 12 APIs. Pick-to: 6.2 5.15 Change-Id: I5e9da66c84457888ec723125d16876891232a99b Reviewed-by: Ivan Solovev Reviewed-by: Alexandru Croitor --- cmake/QtPlatformAndroid.cmake | 2 +- mkspecs/features/android/sdk.prf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index 90e6478707b..24185c1e21c 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-30") +set(QT_ANDROID_API_VERSION "android-31") # Locate android.jar set(QT_ANDROID_JAR "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_VERSION}/android.jar") diff --git a/mkspecs/features/android/sdk.prf b/mkspecs/features/android/sdk.prf index b8df6dc1c6b..83428ae7d70 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-30 +isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-31 ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar !exists($$ANDROID_JAR_FILE) {