Merge remote-tracking branch 'origin/5.0'

Change-Id: Ide9af7da90b7ce2782983a6cb0e5865f038b2212

2 files changed, 15 insertions, 24 deletions

diff --git a/plugins/haskell/stackbuildstep.cpp b/plugins/haskell/stackbuildstep.cpp
index 26c3006..52ed64f 100644
--- a/plugins/haskell/stackbuildstep.cpp
+++ b/plugins/haskell/stackbuildstep.cpp
@@ -42,30 +42,6 @@ StackBuildStep::StackBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id
     : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(trDisplayName());
-
-    const auto updateCommandLine = [this] {
-        const auto projectDir = QDir(project()->projectDirectory().toString());
-        processParameters()->setCommandLine(
-            {HaskellManager::stackExecutable(),
-             {"build",
-              "--work-dir",
-              projectDir.relativeFilePath(buildConfiguration()->buildDirectory().toString())}});
-    };
-    const auto updateEnvironment = [this] {
-        processParameters()->setEnvironment(buildConfiguration()->environment());
-    };
-    updateCommandLine();
-    processParameters()->setWorkingDirectory(project()->projectDirectory());
-    updateEnvironment();
-    connect(HaskellManager::instance(),
-            &HaskellManager::stackExecutableChanged,
-            this,
-            updateCommandLine);
-    connect(buildConfiguration(),
-            &BuildConfiguration::buildDirectoryChanged,
-            this,
-            updateCommandLine);
-    connect(buildConfiguration(), &BuildConfiguration::environmentChanged, this, updateEnvironment);
 }
 
 QWidget *StackBuildStep::createConfigWidget()
@@ -78,6 +54,18 @@ QString StackBuildStep::trDisplayName()
     return tr("Stack Build");
 }
 
+bool StackBuildStep::init()
+{
+    if (AbstractProcessStep::init()) {
+        const auto projectDir = QDir(project()->projectDirectory().toString());
+        processParameters()->setCommandLine(
+            {HaskellManager::stackExecutable(),
+             {"build", "--work-dir", projectDir.relativeFilePath(buildDirectory().toString())}});
+        processParameters()->setEnvironment(buildEnvironment());
+    }
+    return true;
+}
+
 StackBuildStepFactory::StackBuildStepFactory()
 {
     registerStep<StackBuildStep>(Constants::C_STACK_BUILD_STEP_ID);
diff --git a/plugins/haskell/stackbuildstep.h b/plugins/haskell/stackbuildstep.h
index 98938f5..d74d155 100644
--- a/plugins/haskell/stackbuildstep.h
+++ b/plugins/haskell/stackbuildstep.h
@@ -40,6 +40,9 @@ public:
     QWidget *createConfigWidget() override;
 
     static QString trDisplayName();
+
+protected:
+    bool init() override;
 };
 
 class StackBuildStepFactory : public ProjectExplorer::BuildStepFactory