summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Cotty <raphael.cotty@gmail.com>2021-09-17 20:06:17 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2021-09-17 19:35:16 +0000
commitee823732016bb0e98124f0fc3d109aa5e2e85c20 (patch)
tree33a88cd0d6a142cb3b179b9c39e74a9b70582197
parent351461d3680ec680a606fc5333e529c00e161c50 (diff)
downloadqbs-ee823732016bb0e98124f0fc3d109aa5e2e85c20.tar.gz
Android: Fix sdk documentation
Add documentation for Android.sdk dexCompilerName and add some missing "since" tags. Change-Id: I3e9091f89d29eb5c9ab84b2978e0c41d2fda4a7f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r--doc/reference/modules/android-sdk-module.qdoc15
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.