diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/projectexplorer/runconfigurationaspects.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index 5492b2fa2b..7e935be8c2 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<EnvironmentAspect>(); - const Utils::Environment env = envAspect ? envAspect->environment() - : Utils::Environment::systemEnvironment(); - return FileName::fromString( + auto envAspect = runConfiguration()->extraAspect<EnvironmentAspect>(); + 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 |