From 61e7ffc9c7766a5f748cb35f62d2a6145473eb70 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Fri, 26 Jun 2009 14:53:13 +0200
Subject: [PATCH] toolChain() might return a null pointer
Don't crash then
---
src/plugins/qt4projectmanager/projectloadwizard.cpp | 1 -
src/plugins/qt4projectmanager/qt4project.cpp | 10 +++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp
index 1fed2551fc9..2aa999114c4 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.cpp
+++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp
@@ -122,7 +122,6 @@ void ProjectLoadWizard::addBuildConfiguration(QString name, QtVersion *qtversion
m_project->setQtVersion(name, 0);
else
m_project->setQtVersion(name, qtversion->uniqueId());
-
}
void ProjectLoadWizard::done(int result)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index e55477bb268..9f58d477056 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -400,12 +400,14 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
QString Qt4Project::makeCommand(const QString &buildConfiguration) const
{
- return toolChain(buildConfiguration)->makeCommand();
+ ToolChain *tc = toolChain(buildConfiguration);
+ return tc ? tc->makeCommand() : "make";
}
QString Qt4Project::defaultMakeTarget(const QString &buildConfiguration) const
{
- return toolChain(buildConfiguration)->defaultMakeTarget();
+ ToolChain *tc = toolChain(buildConfiguration);
+ return tc ? toolChain(buildConfiguration)->defaultMakeTarget() : "";
}
void Qt4Project::updateCodeModel()
@@ -740,7 +742,9 @@ ProjectExplorer::Environment Qt4Project::baseEnvironment(const QString &buildCon
{
Environment env = useSystemEnvironment(buildConfiguration) ? Environment::systemEnvironment() : Environment();
qtVersion(buildConfiguration)->addToEnvironment(env);
- toolChain(buildConfiguration)->addToEnvironment(env);
+ ToolChain *tc = toolChain(buildConfiguration);
+ if (tc)
+ tc->addToEnvironment(env);
return env;
}
--
GitLab