Commit 30bad4b3 authored by BogDan Vatra's avatar BogDan Vatra
Browse files

Use debug deployment method by default.



Alongside with Ministro is by far the fastest deployment method.

Change-Id: I02de831d312d60c50762e8130ccffefcf1f36843
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent d50e15f6
......@@ -68,6 +68,9 @@ AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent,
m_openPackageLocation(false),
m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::currentConfig().highestAndroidSdk()))
{
const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit());
if (version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0))
m_deployAction = DebugDeployment;
//: AndroidBuildApkStep default display name
setDefaultDisplayName(tr("Build Android APK"));
}
......@@ -145,7 +148,12 @@ void AndroidBuildApkStep::processFinished(int exitCode, QProcess::ExitStatus sta
bool AndroidBuildApkStep::fromMap(const QVariantMap &map)
{
m_deployAction = AndroidDeployAction(map.value(DeployActionKey, BundleLibrariesDeployment).toInt());
AndroidDeployAction defaultDeploy = BundleLibrariesDeployment;
const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit());
if (version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0))
defaultDeploy = DebugDeployment;
m_deployAction = AndroidDeployAction(map.value(DeployActionKey, defaultDeploy).toInt());
if ( m_deployAction == DebugDeployment
&& QtSupport::QtKitInformation::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) {
m_deployAction = BundleLibrariesDeployment;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment