Merge remote-tracking branch 'origin/4.13'

Change-Id: I015bac0cccdf466a923c706abdedd8bd8800b0cd
2020-07-06 10:30:54 +02:00
parent a2bf75bb55 00bb6ea958
commit 1de74cceab
225 changed files with 4591 additions and 1394 deletions
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -190,7 +190,7 @@ bool AndroidBuildApkStep::init()
        m_packagePath = AndroidManager::apkPath(target()).toString();
    }

-    qCDebug(buildapkstepLog) << "Package path:" << m_packagePath;
+    qCDebug(buildapkstepLog) << "APK or AAB path:" << m_packagePath;

    if (!AbstractProcessStep::init())
        return false;