diff options
| author | Daniel Teske <daniel.teske@nokia.com> | 2012-03-28 13:17:34 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2012-03-28 14:00:32 +0200 |
| commit | 2543919b3250f625b26c8de222c312ac62a15349 (patch) | |
| tree | 3bb1bd5ef693c9c66fc135269c9504e0fa19964b /src/plugins/genericprojectmanager/genericmakestep.cpp | |
| parent | 275e207d261f270efa8df809a7dc34e90f60e6e4 (diff) | |
| download | qt-creator-2543919b3250f625b26c8de222c312ac62a15349.tar.gz | |
GenericProjectManager: Fix crash for make deploy steps
Task-number: QTCREATORBUG-7183
Change-Id: Ib917c8990c698b7315ebb79083bf71623b3ae6e7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/genericprojectmanager/genericmakestep.cpp')
| -rw-r--r-- | src/plugins/genericprojectmanager/genericmakestep.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
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<GenericBuildConfiguration *>(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<GenericProject *>(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<GenericProject *>(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<GenericBuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration()); ProjectExplorer::ProcessParameters param; param.setMacroExpander(bc->macroExpander()); |