diff options
| author | hjk <hjk@qt.io> | 2018-09-10 13:16:17 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-09-13 07:34:10 +0000 |
| commit | c74f1e45dd05840a45a6a996198bea5caf090591 (patch) | |
| tree | 31372095f0dc9d6419fd8470dfdcd237ed35c83d | |
| parent | 8584f4e98ca1f11caf5aada1c367a79f65797859 (diff) | |
Adapt to upstream changes to working directory aspect setup
5bc0b6ce removed a working directory's automatic search for an
sibling environment aspect. Pass it explicit here.
Change-Id: I9514b1a7c568fa60e19f9148be5368d49b3b6faf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | plugins/haskell/haskellrunconfiguration.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/haskell/haskellrunconfiguration.cpp b/plugins/haskell/haskellrunconfiguration.cpp index b2b4b7f..ea0233f 100644 --- a/plugins/haskell/haskellrunconfiguration.cpp +++ b/plugins/haskell/haskellrunconfiguration.cpp @@ -58,6 +58,9 @@ HaskellExecutableAspect::HaskellExecutableAspect(RunConfiguration *rc) HaskellRunConfiguration::HaskellRunConfiguration(Target *target, Core::Id id) : RunConfiguration(target, id) { + auto envAspect = + addAspect<LocalEnvironmentAspect>(LocalEnvironmentAspect::BaseEnvironmentModifier()); + auto executableAspect = addAspect<HaskellExecutableAspect>(); connect(target, &Target::applicationTargetsChanged, this, [this, target, executableAspect] { BuildTargetInfo bti = target->applicationTargets().buildTargetInfo(buildKey()); @@ -66,12 +69,11 @@ HaskellRunConfiguration::HaskellRunConfiguration(Target *target, Core::Id id) addAspect<ArgumentsAspect>(); - auto workingDirAspect = addAspect<WorkingDirectoryAspect>(); + auto workingDirAspect = addAspect<WorkingDirectoryAspect>(envAspect); workingDirAspect->setDefaultWorkingDirectory(target->project()->projectDirectory()); workingDirAspect->setVisible(false); addAspect<TerminalAspect>(); - addAspect<LocalEnvironmentAspect>(LocalEnvironmentAspect::BaseEnvironmentModifier()); } void HaskellRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &info) |