diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2021-09-21 16:13:57 +0300 |
---|---|---|
committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-09-21 16:13:57 +0300 |
commit | 8dae282f66706c5dc3865140b25fbcc5c816d635 (patch) | |
tree | a259f544c85ce18eefd5a5a4f40584efb23ddc01 /doc/reference/modules | |
parent | fcd82d6f2c0c1cd780ca18ec2f7c8e3d5a70f814 (diff) | |
parent | 27bd9ac836b5cd2937b8d19dfa32cb4ff617b73c (diff) |
Merge branch '1.20' into master
Change-Id: Iac2a17ef4bacf25becc7f2082a8a73a21b2f4d76
Diffstat (limited to 'doc/reference/modules')
-rw-r--r-- | doc/reference/modules/android-sdk-module.qdoc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/doc/reference/modules/android-sdk-module.qdoc b/doc/reference/modules/android-sdk-module.qdoc index 76a10f69e..ce27b6302 100644 --- a/doc/reference/modules/android-sdk-module.qdoc +++ b/doc/reference/modules/android-sdk-module.qdoc @@ -235,14 +235,16 @@ /*! \qmlproperty string Android.sdk::aaptName + \since Qbs 1.17 Name of the aapt binary. Allowed options: "aapt" and "aapt2". - \defaultvalue \c "aapt" + \defaultvalue \c "aapt2" */ /*! \qmlproperty string Android.sdk::packageType + \since Qbs 1.17 Type of the package. Allowed options: "apk" and "aab". Type "apk" generates a runnable package whereas "aab" generates a package for Google Play. @@ -251,7 +253,17 @@ */ /*! + \qmlproperty string Android.sdk::dexCompilerName + \since Qbs 1.20 + + Name of the dex compiler binary. Allowed options: "dx" and "d8". + + \defaultvalue \c "d8" +*/ + +/*! \qmlproperty string Android.sdk::minimumVersion + \since Qbs 1.17 Minimum API Level required for the application to run. @@ -260,6 +272,7 @@ /*! \qmlproperty string Android.sdk::targetVersion + \since Qbs 1.17 API Level that the application targets. |