aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/haskell/haskellrunconfiguration.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-05-13 16:04:10 +0200
committerEike Ziller <eike.ziller@qt.io>2019-05-13 14:20:10 +0000
commitbef11b6fb4457d1913bf82d06a336fde18b73ac7 (patch)
treefc842c567a958e3532c3b19c217d505a1702c80e /plugins/haskell/haskellrunconfiguration.cpp
parent1f0b6252f52d40305c9a1e0cdf72429448fdab2d (diff)
Adapt to 4.94.9
Change-Id: I649fd586c31149153a501d011bcd95e3452404e8 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'plugins/haskell/haskellrunconfiguration.cpp')
-rw-r--r--plugins/haskell/haskellrunconfiguration.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/haskell/haskellrunconfiguration.cpp b/plugins/haskell/haskellrunconfiguration.cpp
index d3cdb95..ffdcb6d 100644
--- a/plugins/haskell/haskellrunconfiguration.cpp
+++ b/plugins/haskell/haskellrunconfiguration.cpp
@@ -77,7 +77,7 @@ HaskellRunConfiguration::HaskellRunConfiguration(Target *target, Core::Id id)
void HaskellRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &info)
{
- extraAspect<HaskellExecutableAspect>()->setValue(info.buildKey);
+ aspect<HaskellExecutableAspect>()->setValue(info.buildKey);
}
Runnable HaskellRunConfiguration::runnable() const
@@ -90,13 +90,13 @@ Runnable HaskellRunConfiguration::runnable() const
.relativeFilePath(
buildConfiguration->buildDirectory().toString())
+ "\" ";
- const QString executable = extraAspect<HaskellExecutableAspect>()->value();
+ const QString executable = aspect<HaskellExecutableAspect>()->value();
r.commandLineArguments += "exec \"" + executable + "\"";
- const QString arguments = extraAspect<ArgumentsAspect>()->arguments(macroExpander());
+ const QString arguments = aspect<ArgumentsAspect>()->arguments(macroExpander());
if (!arguments.isEmpty())
r.commandLineArguments += " -- " + arguments;
r.workingDirectory = projectDirectory;
- r.environment = extraAspect<LocalEnvironmentAspect>()->environment();
+ r.environment = aspect<LocalEnvironmentAspect>()->environment();
r.executable = r.environment.searchInPath(HaskellManager::stackExecutable().toString()).toString();
return r;
}