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>

1 files changed, 16 insertions, 0 deletions

diff --git a/share/qbs/modules/Android/sdk/sdk.qbs b/share/qbs/modules/Android/sdk/sdk.qbs
index 31f3ed465..563483410 100644
--- a/share/qbs/modules/Android/sdk/sdk.qbs
+++ b/share/qbs/modules/Android/sdk/sdk.qbs
@@ -67,6 +67,8 @@ Module {
     property int buildToolsVersionMinor: buildToolsVersionParts[1]
     property int buildToolsVersionPatch: buildToolsVersionParts[2]
     property string platform: sdkProbe.platform
+    property string minimumVersion: "21"
+    property string targetVersion: platformVersion.toString()
 
     property path bundletoolFilePath: bundletoolProbe.filePath
 
@@ -337,6 +339,20 @@ Module {
                     }
                 }
 
+                var usedSdkElem = rootElem.firstChild("uses-sdk");
+                if (!usedSdkElem || !usedSdkElem.isElement()) {
+                    usedSdkElem = manifestData.createElement("uses-sdk");
+                    rootElem.appendChild(usedSdkElem);
+                } else {
+                    if (!usedSdkElem.isElement())
+                        throw "Tag uses-sdk is not an element in '" + input.filePath + "'.";
+                }
+                usedSdkElem.setAttribute("android:minSdkVersion",
+                                         product.Android.sdk.minimumVersion);
+                usedSdkElem.setAttribute("android:targetSdkVersion",
+                                         product.Android.sdk.targetVersion);
+
+                rootElem.appendChild(usedSdkElem);
                 manifestData.save(output.filePath, 4);
             }
             return cmd;