diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2018-03-15 09:08:30 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2018-08-29 16:42:33 +0000 |
| commit | 0fd44383eebab328b468ea18c3941c384e08f1b0 (patch) | |
| tree | 70f0aa5d4f7ddf076acdc8622667f3019dfccbcf | |
| parent | 537c6d581f2d0d643512bf926a77359ec87b51e0 (diff) | |
| download | qttools-0fd44383eebab328b468ea18c3941c384e08f1b0.tar.gz | |
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.
Change-Id: I1e6546ad0eca29f61a045eba3193171bb33e7a57
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit c03f5673e189ca9fc1f7e3a43f798fa92f7c153e)
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| -rw-r--r-- | src/androiddeployqt/main.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp index 918bc0f6c..ac774ef51 100644 --- a/src/androiddeployqt/main.cpp +++ b/src/androiddeployqt/main.cpp @@ -2481,10 +2481,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) |