From d7c9f3debaa20f6f68f2a2c689948b18b4cca9c2 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Mon, 14 May 2012 14:07:34 +0200
Subject: [PATCH] CMake: Fix crash in makestep if used in the deploystep list

Task-number: QTCREATORBUG-7427
Change-Id: I8cc1e49e87d38c1a789bf3dee25b62668efc433d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
 src/plugins/cmakeprojectmanager/makestep.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp
index 524ba5548a5..a5eb910e602 100644
--- a/src/plugins/cmakeprojectmanager/makestep.cpp
+++ b/src/plugins/cmakeprojectmanager/makestep.cpp
@@ -132,6 +132,8 @@ bool MakeStep::fromMap(const QVariantMap &map)
 bool MakeStep::init()
 {
     CMakeBuildConfiguration *bc = cmakeBuildConfiguration();
+    if (!bc)
+        bc = static_cast<CMakeBuildConfiguration *>(target()->activeBuildConfiguration());
 
     QString arguments = Utils::QtcProcess::joinArgs(m_buildTargets);
     Utils::QtcProcess::addArgs(&arguments, additionalArguments());