diff options
| author | Eike Ziller <[email protected]> | 2012-05-16 15:01:07 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2012-05-16 15:01:07 +0200 |
| commit | e7aded981a2ecdc1c8d6af0f0dce565061054fae (patch) | |
| tree | 451cc5100edbaf0d322f4f9b36c5f95831cf15a9 /src/plugins/cmakeprojectmanager/makestep.cpp | |
| parent | 9ead32dbf1fa0229d9b73f9e1da11e0942291b8a (diff) | |
| parent | 1f435bcbce3112e0e764b9f6190a7f6182ef4558 (diff) | |
Merge remote-tracking branch 'origin/2.5'
Diffstat (limited to 'src/plugins/cmakeprojectmanager/makestep.cpp')
| -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 2bf6121daa9..a28afbd02e6 100644 --- a/src/plugins/cmakeprojectmanager/makestep.cpp +++ b/src/plugins/cmakeprojectmanager/makestep.cpp @@ -130,6 +130,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()); |