diff options
| author | Daniel Teske <daniel.teske@nokia.com> | 2012-05-14 14:07:34 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2012-05-15 13:19:30 +0200 |
| commit | d7c9f3debaa20f6f68f2a2c689948b18b4cca9c2 (patch) | |
| tree | e7facf94f5a668cba196e06b8ecb7f2c8ad2a2fb | |
| parent | ac430542ae24bfe5d19cdff0a0d44e6f8406527e (diff) | |
| download | qt-creator-d7c9f3debaa20f6f68f2a2c689948b18b4cca9c2.tar.gz | |
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>
| -rw-r--r-- | src/plugins/cmakeprojectmanager/makestep.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp index 524ba5548a..a5eb910e60 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()); |