aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-09-04 09:27:56 +0200
committerhjk <hjk@qt.io>2018-09-04 11:03:06 +0000
commitacc982cc282e53458e4527df509986ea9b8b97c3 (patch)
tree3fe4b07236872758b6e385e52e7e97ea06c63843
parent0a3c88e918507a80291f9b38bf3d08f2bc59c37a (diff)
Adapt to upstream RunConfiguration::fillConfigurationLayout changes
Change-Id: Ib3b531027294ed1e5d95842ef12e05b3bf706693 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--plugins/haskell/haskellrunconfiguration.cpp8
-rw-r--r--plugins/haskell/haskellrunconfiguration.h1
2 files changed, 1 insertions, 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;
};