diff options
| author | BogDan Vatra <bogdan@kde.org> | 2020-03-02 17:00:04 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2020-03-04 18:02:35 +0000 |
| commit | 519ea72108fae7f5c4ed7c3e9fed3a999a16ed73 (patch) | |
| tree | 6e23a7b796cf7a0601cfc1151cab3f87b4446152 /src/corelib/Qt5AndroidSupport.cmake | |
| parent | 813111689629a71e51d7d149a5f689b2961f2716 (diff) | |
Android: Bump gradle (plugin) versions
Move min & target sdk from AndroidManifest.xml to build.gradle
Fixes: QTBUG-70817
Change-Id: Id9bb9825a3232587e0255b2d3d6f0273c5f9b66a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib/Qt5AndroidSupport.cmake')
| -rw-r--r-- | src/corelib/Qt5AndroidSupport.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/Qt5AndroidSupport.cmake b/src/corelib/Qt5AndroidSupport.cmake index 5f24fb0e8c..4db38f3957 100644 --- a/src/corelib/Qt5AndroidSupport.cmake +++ b/src/corelib/Qt5AndroidSupport.cmake @@ -18,6 +18,8 @@ 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_TARGET_SDK_VERSION "Android target SDK version" "28") # Make sure to delete the "android-build" directory, which contains all the # build artefacts, and also the androiddeployqt/gradle artefacts @@ -101,6 +103,9 @@ if (NOT ${PROJECT_NAME}-MultiAbiBuild) generate_json_variable(ANDROID_VERSION_NAME "android-version-name") generate_json_variable_list(ANDROID_EXTRA_LIBS "android-extra-libs") generate_json_variable_list(QML_IMPORT_PATH "qml-import-paths") + generate_json_variable_list(ANDROID_MIN_SDK_VERSION "android-min-sdk-version") + generate_json_variable_list(ANDROID_TARGET_SDK_VERSION "android-target-sdk-version") + configure_file( "${CMAKE_BINARY_DIR}/android_deployment_settings.json.in" |