diff options
| author | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-10-13 15:38:08 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-10-21 07:40:09 +0000 |
| commit | 2f5f049ecf777bcfcbfe4a17af72768248f73eab (patch) | |
| tree | 9e3d27c2a21c37e16de52c89db9b367cb2c76fd4 /doc | |
| parent | eb7adb8d9787dddef89e46f7bf6e594d0b5faf4b (diff) | |
Android: Update for Qt 5.15
Use java.additionalClassPaths property to allow compilation of binding classes
because starting with Qt 5.15 they depend on QtAndroid.jar
Update AndroidManifest.xml with uses-sdk node using new properties Android.sdk.minVersion
and Android.sdk.targetVersion because Qt 5.15 uses androiddeployqt to set it.
Fixes: QBS-1580
Change-Id: I2fa5e77bb183be1b55e9dd9756fb7b6eb1f3c9d4
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/modules/android-sdk-module.qdoc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/reference/modules/android-sdk-module.qdoc b/doc/reference/modules/android-sdk-module.qdoc index 676eaa825..af68aca1f 100644 --- a/doc/reference/modules/android-sdk-module.qdoc +++ b/doc/reference/modules/android-sdk-module.qdoc @@ -250,3 +250,19 @@ \defaultvalue \c "apk" */ + +/*! + \qmlproperty string Android.sdk::minimumVersion + + Minimum API Level required for the application to run. + + \defaultvalue \c "21" +*/ + +/*! + \qmlproperty string Android.sdk::targetVersion + + API Level that the application targets. + + \defaultvalue \c platformVersion +*/ |