summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-09-12 10:03:16 +0200
committerhjk <hjk@qt.io>2018-09-13 07:34:23 +0000
commit1af5ae098325b46a2651c292bf798b4cf7224ebc (patch)
tree1a809f4697a46902c82f7d67b8ef1a88d62a1d87
parentc74f1e45dd05840a45a6a996198bea5caf090591 (diff)
Adapt to upstream arguments aspect signature change
Change-Id: I28c3e037caafaeaffa42b42fe822025ad29dfa26 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-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 ea0233f..3b568b7 100644
--- a/plugins/haskell/haskellrunconfiguration.cpp
+++ b/plugins/haskell/haskellrunconfiguration.cpp
@@ -91,11 +91,11 @@ Runnable HaskellRunConfiguration::runnable() const
.relativeFilePath(
buildConfiguration->buildDirectory().toString())
+ "\" ";
- QString executable = extraAspect<HaskellExecutableAspect>()->value();
+ const QString executable = extraAspect<HaskellExecutableAspect>()->value();
r.commandLineArguments += "exec \"" + executable + "\"";
- auto argumentsAspect = extraAspect<ArgumentsAspect>();
- if (!argumentsAspect->arguments().isEmpty())
- r.commandLineArguments += " -- " + argumentsAspect->arguments();
+ const QString arguments = extraAspect<ArgumentsAspect>()->arguments(macroExpander());
+ if (!arguments.isEmpty())
+ r.commandLineArguments += " -- " + arguments;
r.workingDirectory = projectDirectory;
r.environment = extraAspect<LocalEnvironmentAspect>()->environment();
r.executable = r.environment.searchInPath(HaskellManager::stackExecutable().toString()).toString();