From 2543919b3250f625b26c8de222c312ac62a15349 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 28 Mar 2012 13:17:34 +0200 Subject: GenericProjectManager: Fix crash for make deploy steps Task-number: QTCREATORBUG-7183 Change-Id: Ib917c8990c698b7315ebb79083bf71623b3ae6e7 Reviewed-by: Tobias Hunger --- src/plugins/genericprojectmanager/genericmakestep.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp index 5a6d782ee4..57bb1d49b0 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.cpp +++ b/src/plugins/genericprojectmanager/genericmakestep.cpp @@ -110,6 +110,8 @@ GenericBuildConfiguration *GenericMakeStep::genericBuildConfiguration() const bool GenericMakeStep::init() { GenericBuildConfiguration *bc = genericBuildConfiguration(); + if (!bc) + bc = static_cast(target()->activeBuildConfiguration()); ProjectExplorer::ProcessParameters *pp = processParameters(); pp->setMacroExpander(bc->macroExpander()); @@ -173,7 +175,7 @@ QString GenericMakeStep::makeCommand() const { QString command = m_makeCommand; if (command.isEmpty()) { - GenericProject *pro = genericBuildConfiguration()->genericTarget()->genericProject(); + GenericProject *pro = static_cast(target()->project()); if (ProjectExplorer::ToolChain *toolChain = pro->toolChain()) command = toolChain->makeCommand(); else @@ -224,7 +226,7 @@ GenericMakeStepConfigWidget::GenericMakeStepConfigWidget(GenericMakeStep *makeSt m_ui->setupUi(this); // TODO update this list also on rescans of the GenericLists.txt - GenericProject *pro = m_makeStep->genericBuildConfiguration()->genericTarget()->genericProject(); + GenericProject *pro = static_cast(m_makeStep->target()->project()); foreach (const QString &target, pro->buildTargets()) { QListWidgetItem *item = new QListWidgetItem(target, m_ui->targetsList); item->setFlags(item->flags() | Qt::ItemIsUserCheckable); @@ -263,6 +265,8 @@ void GenericMakeStepConfigWidget::updateMakeOverrrideLabel() void GenericMakeStepConfigWidget::updateDetails() { GenericBuildConfiguration *bc = m_makeStep->genericBuildConfiguration(); + if (!bc) + bc = static_cast(m_makeStep->target()->activeBuildConfiguration()); ProjectExplorer::ProcessParameters param; param.setMacroExpander(bc->macroExpander()); -- cgit v1.2.3