ProjectExplorer: Pass macro expander to WorkingDirectoryAspect

... when needed to avoid a use of IRCAspect::runConfiguration.

Change-Id: I0bdae0a2a1aad4475dd3225e6ae71da7bfd9513f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
hjk
2018-09-10 15:08:47 +02:00
parent 8b24fb2a46
commit b95b675e41
4 changed files with 9 additions and 7 deletions

View File

@@ -442,7 +442,7 @@ Runnable RunConfiguration::runnable() const
if (auto aspect = extraAspect<ArgumentsAspect>())
r.commandLineArguments = aspect->arguments();
if (auto aspect = extraAspect<WorkingDirectoryAspect>())
r.workingDirectory = aspect->workingDirectory().toString();
r.workingDirectory = aspect->workingDirectory(macroExpander()).toString();
if (auto aspect = extraAspect<EnvironmentAspect>())
r.environment = aspect->environment();
return r;