diff options
| author | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-05-20 11:48:46 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-06-04 07:55:24 +0000 |
| commit | 3e2b35f2f3d8c1e9ba3d8248033dcdcc90cf80fe (patch) | |
| tree | b881b8339ddc18fba81d37d793fa41810dfdb89a /doc | |
| parent | 5c0b5b590e83dd1fe0b8b381bb2c4b9e8e16d816 (diff) | |
Android: Add option to use aapt2 instead of aapt in Android.sdk module
aapt has been deprecated (https://developer.android.com/studio/command-line/aapt2) and replaced by aapt2.
PropertyOption aaptFileName allows those value: "aapt" and "aapt2".
Default value is set to "aapt" for the moment.
Fixes: QBS-1562
Change-Id: I1970cafaa54a0e035c08ffe5f9967b712f5c5253
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/modules/android-sdk-module.qdoc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/reference/modules/android-sdk-module.qdoc b/doc/reference/modules/android-sdk-module.qdoc index 2c2e43eab..74599d0ba 100644 --- a/doc/reference/modules/android-sdk-module.qdoc +++ b/doc/reference/modules/android-sdk-module.qdoc @@ -233,3 +233,11 @@ \qmlproperty stringList Android.sdk::aidlSearchPaths Search paths for import statements to pass to the \c aidl tool via the \c{-I} option. */ + +/*! + \qmlproperty string Android.sdk::aaptName + + Name of the aapt binary. Allowed options: "aapt" and "aapt2". + + \defaultvalue \c "aapt" +*/ |