From 37a336056a97c381c5a17bc92f5597916c107509 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 13 Jan 2015 12:52:58 +0100 Subject: [PATCH] Android: Fix cloning of "Make install" step Task-number: QTCREATORBUG-13819 Change-Id: Ibf9049cf00dfcfe25c8399c1fd39ae3b26e8fd23 Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: BogDan Vatra --- .../androidpackageinstallationfactory.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp index 9c20c29020f..5028ae23f43 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp @@ -99,7 +99,15 @@ BuildStep *AndroidPackageInstallationFactory::restore(BuildStepList *parent, con bool AndroidPackageInstallationFactory::canClone(BuildStepList *parent, BuildStep *product) const { - return canCreate(parent, product->id()); + if (parent->id() != ProjectExplorer::Constants::BUILDSTEPS_BUILD) + return false; + if (!Android::AndroidManager::supportsAndroid(parent->target())) + return false; + if (product->id() != AndroidPackageInstallationStep::Id) + return false; + if (parent->contains(AndroidPackageInstallationStep::Id)) + return false; + return true; } BuildStep *AndroidPackageInstallationFactory::clone(BuildStepList *parent, BuildStep *product)