diff options
author | dt <qtc-committer@nokia.com> | 2009-09-03 13:21:01 +0200 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2009-09-03 16:13:32 +0200 |
commit | 150cbaaa0a69197242ff94bc506e9027998b8539 (patch) | |
tree | b75276adef3d8fa7e233b568080101a640f1a7ff | |
parent | db95eee51d279da0070bad113e92e19badf34fd2 (diff) |
Fix crash, with a non existing toolchain.
(cherry picked from commit e1f9a003bbbaefaeca97848c0713165935144b79)
-rw-r--r-- | src/plugins/qt4projectmanager/makestep.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 71c76fd20d..e22eea26d6 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -103,7 +103,11 @@ bool MakeStep::init(const QString &name) // FIXME doing this without the user having a way to override this is rather bad // so we only do it for unix and if the user didn't override the make command // but for now this is the least invasive change - ProjectExplorer::ToolChain::ToolChainType t = qobject_cast<Qt4Project *>(project())->toolChain(name)->type(); + ProjectExplorer::ToolChain *toolchain = qobject_cast<Qt4Project *>(project())->toolChain(name); + + ProjectExplorer::ToolChain::ToolChainType t = ProjectExplorer::ToolChain::UNKNOWN; + if (toolchain) + t = toolchain->type(); if (t != ProjectExplorer::ToolChain::MSVC && t != ProjectExplorer::ToolChain::WINCE) { if (value(name, "makeCmd").toString().isEmpty()) args << "-w"; |