From adc205631bd6a83e11b86112e0d8996fc8acbe52 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 25 Mar 2020 06:54:33 +0100 Subject: [PATCH] Android: Update minimum version to 23 again In 519ea72108fae7f5c4ed7c3e9fed3a999a16ed73, the minimum SDK version was moved away from the AndroidManifest.xml, and when the change was merged, we lost parts of the update to set the minimum version to 23. This redoes it in the remaining locations. Change-Id: Iada8188d3c0c8ec0a4801c1d219640ecb3976753 Reviewed-by: BogDan Vatra --- src/corelib/Qt5AndroidSupport.cmake | 2 +- src/tools/androiddeployqt/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/Qt5AndroidSupport.cmake b/src/corelib/Qt5AndroidSupport.cmake index 4db38f39574..662dd87c1f2 100644 --- a/src/corelib/Qt5AndroidSupport.cmake +++ b/src/corelib/Qt5AndroidSupport.cmake @@ -18,7 +18,7 @@ if (NOT ${PROJECT_NAME}-MultiAbiBuild) option(ANDROID_BUILD_ABI_${abi} "Enable the build for Android ${abi}" ${abi_initial_value}) endif() endforeach() - option(ANDROID_MIN_SDK_VERSION "Android minimum SDK version" "21") + option(ANDROID_MIN_SDK_VERSION "Android minimum SDK version" "23") option(ANDROID_TARGET_SDK_VERSION "Android target SDK version" "28") # Make sure to delete the "android-build" directory, which contains all the diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index ba3c0dad836..46aaa525e2c 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -170,7 +170,7 @@ struct Options // Versioning QString versionName; QString versionCode; - QByteArray minSdkVersion{"21"}; + QByteArray minSdkVersion{"23"}; QByteArray targetSdkVersion{"28"}; // lib c++ path