From b6792f095c278f9aa5ac32224b9cd471f9454c8d Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Thu, 3 Dec 2015 11:13:42 +0100
Subject: [PATCH] QMakeStep: Prevent possible crash

Task-number: QTCREATORBUG-15443
Change-Id: Ibec61938a911e7265fa1f12c4f3c7b60bf514b7c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp | 3 ++-
 src/plugins/qmakeprojectmanager/qmakeproject.cpp            | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index 92a3ac5b538..29492a4c8a0 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -745,9 +745,10 @@ BuildConfiguration *QmakeBuildConfigurationFactory::restore(Target *parent, cons
 
 BuildConfiguration::BuildType QmakeBuildConfiguration::buildType() const
 {
+    QMakeStep *qs = qmakeStep();
     if (qmakeBuildConfiguration() & BaseQtVersion::DebugBuild)
         return Debug;
-    else if (qmakeStep()->separateDebugInfo())
+    else if (qs && qs->separateDebugInfo())
         return Profile;
     else
         return Release;
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 561d5535db7..c2b29fea0c5 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -923,8 +923,8 @@ QtSupport::ProFileReader *QmakeProject::createProFileReader(const QmakeProFileNo
         if (bc) {
             k = bc->target()->kit();
             env = bc->environment();
-            if (bc->qmakeStep())
-                qmakeArgs = bc->qmakeStep()->parserArguments();
+            if (QMakeStep *qs = bc->qmakeStep())
+                qmakeArgs = qs->parserArguments();
             else
                 qmakeArgs = bc->configCommandLineArguments();
         } else {