From 9db6897e55970eb44732bec320191beea0e130a0 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 24 Jun 2016 11:44:34 +0200 Subject: [PATCH] RunConfigurationAspect: Re-enable macro substitution Re-enable macro substitution in work directory of run configurations. This makes it possible to do %{sourceDir} or %{buildDir} again. Task-number: QTCREATORBUG-16338 Change-Id: Ifff7831bf3aa0078d13185da5f5e7c6a3be2f852 Reviewed-by: hjk --- .../projectexplorer/runconfigurationaspects.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index 5492b2fa2b2..7e935be8c2d 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp @@ -215,16 +215,12 @@ void WorkingDirectoryAspect::toMap(QVariantMap &data) const FileName WorkingDirectoryAspect::workingDirectory() const { - if (m_chooser) { - return m_chooser->fileName(); - } else { - auto envAspect = runConfiguration()->extraAspect(); - const Utils::Environment env = envAspect ? envAspect->environment() - : Utils::Environment::systemEnvironment(); - return FileName::fromString( + auto envAspect = runConfiguration()->extraAspect(); + const Utils::Environment env = envAspect ? envAspect->environment() + : Utils::Environment::systemEnvironment(); + return FileName::fromString( runConfiguration()->macroExpander()->expandProcessArgs( - PathChooser::expandedDirectory(m_workingDirectory.toString(), env, QString()))); - } + PathChooser::expandedDirectory(m_workingDirectory.toString(), env, QString()))); } FileName WorkingDirectoryAspect::defaultWorkingDirectory() const