From acc982cc282e53458e4527df509986ea9b8b97c3 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 4 Sep 2018 09:27:56 +0200
Subject: Adapt to upstream RunConfiguration::fillConfigurationLayout changes

Change-Id: Ib3b531027294ed1e5d95842ef12e05b3bf706693
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 plugins/haskell/haskellrunconfiguration.cpp | 8 +-------
 plugins/haskell/haskellrunconfiguration.h   | 1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/plugins/haskell/haskellrunconfiguration.cpp b/plugins/haskell/haskellrunconfiguration.cpp
index e555c5f..d6aad3d 100644
--- a/plugins/haskell/haskellrunconfiguration.cpp
+++ b/plugins/haskell/haskellrunconfiguration.cpp
@@ -71,17 +71,11 @@ HaskellRunConfiguration::HaskellRunConfiguration(Target *target, Core::Id id)
     addExtraAspect(new ArgumentsAspect(this));
     auto workingDirAspect = new WorkingDirectoryAspect(this);
     workingDirAspect->setDefaultWorkingDirectory(target->project()->projectDirectory());
+    workingDirAspect->setVisible(false);
     addExtraAspect(new TerminalAspect(this));
     addExtraAspect(new LocalEnvironmentAspect(this, LocalEnvironmentAspect::BaseEnvironmentModifier()));
 }
 
-void HaskellRunConfiguration::fillConfigurationLayout(QFormLayout *layout) const
-{
-    extraAspect<HaskellExecutableAspect>()->addToConfigurationLayout(layout);
-    extraAspect<ArgumentsAspect>()->addToConfigurationLayout(layout);
-    extraAspect<TerminalAspect>()->addToConfigurationLayout(layout);
-}
-
 void HaskellRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &info)
 {
     extraAspect<HaskellExecutableAspect>()->setValue(info.buildKey);
diff --git a/plugins/haskell/haskellrunconfiguration.h b/plugins/haskell/haskellrunconfiguration.h
index 536124d..8af9a18 100644
--- a/plugins/haskell/haskellrunconfiguration.h
+++ b/plugins/haskell/haskellrunconfiguration.h
@@ -53,7 +53,6 @@ public:
     HaskellRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
 
 private:
-    void fillConfigurationLayout(QFormLayout *layout) const final;
     void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &info) final;
     ProjectExplorer::Runnable runnable() const final;
 };
-- 
cgit v1.2.3