Fix apkPath for gradle 4.0+

This change keeps the compatibility with old gradle.
It is needed for projects that must use the old gradle version.

src/tools/androiddeployqt/main.cpp was moved from qttools into
qtbase in 5.11. So re-apply c03f5673 in qttools here.

Change-Id: Iaa669c6bf12277cb0cde422228a5c653b6bcf433
Reviewed-by: Volker Krause <volker.krause@kdab.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index ebd9480808..f57134aa71 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -2331,10 +2331,15 @@ enum PackageType {
 QString apkPath(const Options &options, PackageType pt)
 {
     QString path(options.outputDirectory);
-    if (options.gradle)
-        path += QLatin1String("/build/outputs/apk/") + QDir(options.outputDirectory).dirName() + QLatin1Char('-');
-    else
+    if (options.gradle) {
+        path += QLatin1String("/build/outputs/apk/");
+        QString buildType(options.releasePackage ? QLatin1String("release/") : QLatin1String("debug/"));
+        if (QDir(path + buildType).exists())
+            path += buildType;
+        path += QDir(options.outputDirectory).dirName() + QLatin1Char('-');
+    } else {
         path += QLatin1String("/bin/QtApp-");
+    }
     if (options.releasePackage) {
         path += QLatin1String("release-");
         if (pt == UnsignedAPK)