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

QMakeStep: Prevent possible crash

Browse Source 
Task-number: QTCREATORBUG-15443
Change-Id: Ibec61938a911e7265fa1f12c4f3c7b60bf514b7c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-12-03 11:13:42 +01:00
parent 9a5abd1467
commit b6792f095c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -745,9 +745,10 @@ BuildConfiguration *QmakeBuildConfigurationFactory::restore(Target *parent, cons
BuildConfiguration::BuildType QmakeBuildConfiguration::buildType() const BuildConfiguration::BuildType QmakeBuildConfiguration::buildType() const
{ {
QMakeStep *qs = qmakeStep();
if (qmakeBuildConfiguration() & BaseQtVersion::DebugBuild) if (qmakeBuildConfiguration() & BaseQtVersion::DebugBuild)
return Debug; return Debug;
else if (qmakeStep()->separateDebugInfo()) else if (qs && qs->separateDebugInfo())
return Profile; return Profile;
else else
return Release; return Release;

4
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -923,8 +923,8 @@ QtSupport::ProFileReader *QmakeProject::createProFileReader(const QmakeProFileNo
if (bc) { if (bc) {
k = bc->target()->kit(); k = bc->target()->kit();
env = bc->environment(); env = bc->environment();
if (bc->qmakeStep()) if (QMakeStep *qs = bc->qmakeStep())
qmakeArgs = bc->qmakeStep()->parserArguments(); qmakeArgs = qs->parserArguments();
else else
qmakeArgs = bc->configCommandLineArguments(); qmakeArgs = bc->configCommandLineArguments();
} else { } else {