From fea23ff5a1e2d80a487f895b4c490678cf0dfdef Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Tue, 10 Jan 2012 15:08:50 +0100
Subject: [PATCH] Fix crash on adding MakeSteps to a DeployConfiguration
Task-number: QTCREATORBUG-6688
Change-Id: I6d1e44ee0e1e67a5fc4289f508a7c285e4e6c13a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
src/plugins/qt4projectmanager/makestep.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index dfc795158d2..03bd454eab7 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -130,8 +130,18 @@ bool MakeStep::fromMap(const QVariantMap &map)
bool MakeStep::init()
{
Qt4BuildConfiguration *bc = qt4BuildConfiguration();
+ if (!bc)
+ bc = qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
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()) {
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."),
--
GitLab