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

Android: Check if DebugDeployment is usable.

Browse Source 
It might happen when the user changes the kit from Qt 5.4 to Qt 5.3.

Change-Id: Ib9597ac0189bdc1ac4e82ac8b5de5e090f09283e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2014-08-01 08:57:14 +03:00
parent 3e9272727b
commit 49707ff3f0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,11 @@ AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent,
m_openPackageLocation(other->m_openPackageLocation), m_openPackageLocation(other->m_openPackageLocation),
m_buildTargetSdk(other->m_buildTargetSdk) m_buildTargetSdk(other->m_buildTargetSdk)
{ {
const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit());
if (version->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) {
if (m_deployAction == DebugDeployment)
m_deployAction = BundleLibrariesDeployment;
}
} }
bool AndroidBuildApkStep::init() bool AndroidBuildApkStep::init()