diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index f2e65394583..8d11338a2be 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -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;