2 files changed, 5 insertions, 16 deletions
diff --git a/src/plugins/nim/project/nimblebuildconfiguration.cpp b/src/plugins/nim/project/nimblebuildconfiguration.cpp
index a49485aed5a..873b88de66d 100644
--- a/src/plugins/nim/project/nimblebuildconfiguration.cpp
+++ b/src/plugins/nim/project/nimblebuildconfiguration.cpp
@@ -65,8 +65,6 @@ BuildConfiguration::BuildType NimbleBuildConfiguration::buildType() const
 
 void NimbleBuildConfiguration::initialize()
 {
-    BuildConfiguration::initialize();
-
     m_buildType = initialBuildType();
 
     setBuildDirectory(project()->projectDirectory());
@@ -78,8 +76,7 @@ void NimbleBuildConfiguration::initialize()
 //    // Don't add a nimble build step when the package has no binaries (i.e a library package)
 //    if (!m_nimbleBuildSystem->metadata().bin.empty())
 //    {
-        BuildStepList *buildSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
-        buildSteps->appendStep(new NimbleBuildStep(buildSteps));
+        buildSteps()->appendStep(new NimbleBuildStep(buildSteps()));
 //    }
 }
 
diff --git a/src/plugins/nim/project/nimbuildconfiguration.cpp b/src/plugins/nim/project/nimbuildconfiguration.cpp
index c04685f2384..42f0177cebf 100644
--- a/src/plugins/nim/project/nimbuildconfiguration.cpp
+++ b/src/plugins/nim/project/nimbuildconfiguration.cpp
@@ -75,8 +75,6 @@ NimBuildConfiguration::NimBuildConfiguration(Target *target, Core::Id id)
 
 void NimBuildConfiguration::initialize()
 {
-    BuildConfiguration::initialize();
-
     // Create the build configuration and initialize it from build info
     setBuildDirectory(defaultBuildDirectory(target()->kit(),
                                             project()->projectFilePath(),
@@ -85,8 +83,7 @@ void NimBuildConfiguration::initialize()
 
     // Add nim compiler build step
     {
-        BuildStepList *buildSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
-        auto nimCompilerBuildStep = new NimCompilerBuildStep(buildSteps);
+        auto nimCompilerBuildStep = new NimCompilerBuildStep(buildSteps());
         NimCompilerBuildStep::DefaultBuildOptions defaultOption;
         switch (initialBuildType()) {
         case BuildConfiguration::Release:
@@ -107,14 +104,11 @@ void NimBuildConfiguration::initialize()
 
         if (!nimFiles.isEmpty())
             nimCompilerBuildStep->setTargetNimFile(nimFiles.first());
-        buildSteps->appendStep(nimCompilerBuildStep);
+        buildSteps()->appendStep(nimCompilerBuildStep);
     }
 
     // Add clean step
-    {
-        BuildStepList *cleanSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
-        cleanSteps->appendStep(Constants::C_NIMCOMPILERCLEANSTEP_ID);
-    }
+    cleanSteps()->appendStep(Constants::C_NIMCOMPILERCLEANSTEP_ID);
 }
 
 FilePath NimBuildConfiguration::cacheDirectory() const
@@ -131,9 +125,7 @@ FilePath NimBuildConfiguration::outFilePath() const
 
 const NimCompilerBuildStep *NimBuildConfiguration::nimCompilerBuildStep() const
 {
-    BuildStepList *steps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
-    QTC_ASSERT(steps, return nullptr);
-    foreach (BuildStep *step, steps->steps())
+    foreach (BuildStep *step, buildSteps()->steps())
         if (step->id() == Constants::C_NIMCOMPILERBUILDSTEP_ID)
             return qobject_cast<NimCompilerBuildStep *>(step);
     return nullptr;