diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2018-03-15 09:08:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-09 07:21:19 +0000 |
| commit | 490d461ab080777d6418dce97db632dc2270d218 (patch) | |
| tree | 1e923733ed04f0db06801eeb060839ed25c29978 | |
| parent | f2668c6b43a80a83ebdd46407a01af8a0dc6285f (diff) | |
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.
Task-number: QTBUG-69755
Change-Id: I2399d445f8208766e4185d717bb51f1317fdcc00
Reviewed-by: Volker Krause <volker.krause@kdab.com>
(cherry picked from commit e2f41931129d77dd9e92c812d965d7252673661a)
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index f00188396d..57714fc687 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -2328,10 +2328,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) |