feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

toolChain() might return a null pointer

Browse Source 
Don't crash then
This commit is contained in:
dt
2009-06-26 14:53:13 +02:00
parent 6f675c287c
commit 61e7ffc9c7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qt4projectmanager/projectloadwizard.cpp
View File

@@ -122,7 +122,6 @@ void ProjectLoadWizard::addBuildConfiguration(QString name, QtVersion *qtversion
m_project->setQtVersion(name, 0); m_project->setQtVersion(name, 0);
else else
m_project->setQtVersion(name, qtversion->uniqueId()); m_project->setQtVersion(name, qtversion->uniqueId());
} }
void ProjectLoadWizard::done(int result) void ProjectLoadWizard::done(int result)

10
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -400,12 +400,14 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
QString Qt4Project::makeCommand(const QString &buildConfiguration) const 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 QString Qt4Project::defaultMakeTarget(const QString &buildConfiguration) const
{ {
return toolChain(buildConfiguration)->defaultMakeTarget(); ToolChain *tc = toolChain(buildConfiguration);
return tc ? toolChain(buildConfiguration)->defaultMakeTarget() : "";
} }
void Qt4Project::updateCodeModel() void Qt4Project::updateCodeModel()
@@ -740,7 +742,9 @@ ProjectExplorer::Environment Qt4Project::baseEnvironment(const QString &buildCon
{ {
Environment env = useSystemEnvironment(buildConfiguration) ? Environment::systemEnvironment() : Environment(); Environment env = useSystemEnvironment(buildConfiguration) ? Environment::systemEnvironment() : Environment();
qtVersion(buildConfiguration)->addToEnvironment(env); qtVersion(buildConfiguration)->addToEnvironment(env);
toolChain(buildConfiguration)->addToEnvironment(env); ToolChain *tc = toolChain(buildConfiguration);
if (tc)
tc->addToEnvironment(env);
return env; return env;
} }