From 49707ff3f08834735bba85ca4728eeec095f5a1c Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Fri, 1 Aug 2014 08:57:14 +0300 Subject: [PATCH] Android: Check if DebugDeployment is usable. It might happen when the user changes the kit from Qt 5.4 to Qt 5.3. Change-Id: Ib9597ac0189bdc1ac4e82ac8b5de5e090f09283e Reviewed-by: Daniel Teske --- src/plugins/android/androidbuildapkstep.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 8d11338a2be..c1b6a4cfcf1 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -84,7 +84,11 @@ AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent, m_openPackageLocation(other->m_openPackageLocation), 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()