feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use debug deployment method by default.

Browse Source 
Alongside with Ministro is by far the fastest deployment method.

Change-Id: I02de831d312d60c50762e8130ccffefcf1f36843
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2014-07-21 21:33:24 +03:00
parent d50e15f611
commit 30bad4b3f0
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -68,6 +68,9 @@ AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent,
m_openPackageLocation(false), m_openPackageLocation(false),
m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::currentConfig().highestAndroidSdk())) 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 //: AndroidBuildApkStep default display name
setDefaultDisplayName(tr("Build Android APK")); setDefaultDisplayName(tr("Build Android APK"));
} }
@@ -145,7 +148,12 @@ void AndroidBuildApkStep::processFinished(int exitCode, QProcess::ExitStatus sta
bool AndroidBuildApkStep::fromMap(const QVariantMap &map) 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 if ( m_deployAction == DebugDeployment
&& QtSupport::QtKitInformation::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) { && QtSupport::QtKitInformation::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) {
m_deployAction = BundleLibrariesDeployment; m_deployAction = BundleLibrariesDeployment;