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

Fix crash on adding MakeSteps to a DeployConfiguration

Browse Source 
Task-number: QTCREATORBUG-6688
Change-Id: I6d1e44ee0e1e67a5fc4289f508a7c285e4e6c13a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Daniel Teske
2012-01-10 15:08:50 +01:00
parent 6f085665cf
commit fea23ff5a1
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -130,8 +130,18 @@ bool MakeStep::fromMap(const QVariantMap &map)
bool MakeStep::init() bool MakeStep::init()
{ {
Qt4BuildConfiguration *bc = qt4BuildConfiguration(); Qt4BuildConfiguration *bc = qt4BuildConfiguration();
if (!bc)
bc = qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
m_tasks.clear(); m_tasks.clear();
if (!bc) {
m_tasks.append(ProjectExplorer::Task(ProjectExplorer::Task::Error,
tr("Qt Creator needs a buildconfiguration set up to build. Configure a tool chain in Project mode."),
QString(), -1,
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return false;
}
if (!bc->toolChain()) { if (!bc->toolChain()) {
m_tasks.append(ProjectExplorer::Task(ProjectExplorer::Task::Error, m_tasks.append(ProjectExplorer::Task(ProjectExplorer::Task::Error,
tr("Qt Creator needs a tool chain set up to build. Configure a tool chain in Project mode."), tr("Qt Creator needs a tool chain set up to build. Configure a tool chain in Project mode."),