summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2009-06-30 12:09:05 +0200
committerdt <qtc-committer@nokia.com>2009-06-30 12:09:05 +0200
commit11c1014649692b41ec7d43af2abec7bc5bc1e6b0 (patch)
tree490b6c1513192af03d07ab8c7026ec321ee4d5c3
parentc41e84feef46ac68ee6e36db3e50031171765243 (diff)
downloadqt-creator-11c1014649692b41ec7d43af2abec7bc5bc1e6b0.tar.gz
QtVersion::toolchain() can be 0, fix crash.
Backport of a very similar patch to master.
-rw-r--r--src/plugins/qt4projectmanager/qt4project.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 3a8095ca3f..e3af60d9dc 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -377,7 +377,11 @@ void Qt4Project::scheduleUpdateCodeModel(Qt4ProjectManager::Internal::Qt4ProFile
QString Qt4Project::makeCommand(const QString &buildConfiguration) const
{
- return qtVersion(buildConfiguration)->toolChain()->makeCommand();
+ ProjectExplorer::ToolChain *tc = qtVersion(buildConfiguration)->toolChain();
+ if (tc)
+ return tc->makeCommand();
+ else
+ return QString();
}
void Qt4Project::updateCodeModel()