From 3c1c37f1cb8262de5c2c2b370e1133ded7655ae5 Mon Sep 17 00:00:00 2001 From: Filippo Cucchetto Date: Wed, 3 Aug 2016 23:54:56 +0200 Subject: [PATCH] Nim: Removed wrong asserts triggered during restore of buildsteps During the restore phase the project buildsteps could be null. So during the checks if the project already contains a build/clean step we should handle the null case. Change-Id: I6a2bb66fc9c12004ab4fff6be4da4c44dec9c063 Task-number: QTCREATORBUG-16687 Reviewed-by: Christian Stenger --- src/plugins/nim/project/nimbuildconfiguration.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/nim/project/nimbuildconfiguration.cpp b/src/plugins/nim/project/nimbuildconfiguration.cpp index 6837063fbf1..d382ec5adb4 100644 --- a/src/plugins/nim/project/nimbuildconfiguration.cpp +++ b/src/plugins/nim/project/nimbuildconfiguration.cpp @@ -106,14 +106,12 @@ bool NimBuildConfiguration::canRestore(const QVariantMap &map) bool NimBuildConfiguration::hasNimCompilerBuildStep() const { BuildStepList *steps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); - QTC_ASSERT(steps, return false); - return steps->contains(Constants::C_NIMCOMPILERBUILDSTEP_ID); + return steps ? steps->contains(Constants::C_NIMCOMPILERBUILDSTEP_ID) : false; } bool NimBuildConfiguration::hasNimCompilerCleanStep() const { BuildStepList *steps = stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN); - QTC_ASSERT(steps, return false); return steps ? steps->contains(Constants::C_NIMCOMPILERCLEANSTEP_ID) : false; }