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

Android: Fix cloning of "Make install" step

Browse Source 
Task-number: QTCREATORBUG-13819
Change-Id: Ibf9049cf00dfcfe25c8399c1fd39ae3b26e8fd23
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2015-01-13 12:52:58 +01:00
parent 230be99474
commit 37a336056a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.cpp
View File

@@ -99,7 +99,15 @@ BuildStep *AndroidPackageInstallationFactory::restore(BuildStepList *parent, con
bool AndroidPackageInstallationFactory::canClone(BuildStepList *parent, BuildStep *product) const 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) BuildStep *AndroidPackageInstallationFactory::clone(BuildStepList *parent, BuildStep *product)