feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Fix expansion of variables in working directory

Browse Source 
... when actually running the binary.
Amends 3dd8831f14.

Fixes: QTCREATORBUG-26438
Change-Id: I69fb8df514cb3ab00df76e241a3e367031fce94b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2021-10-19 14:17:01 +02:00
parent 575ca89b3e
commit 71e6e30dbf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/runconfigurationaspects.cpp
View File

@@ -251,7 +251,9 @@ FilePath WorkingDirectoryAspect::workingDirectory() const
const Environment env = m_envAspect ? m_envAspect->environment() const Environment env = m_envAspect ? m_envAspect->environment()
: Environment::systemEnvironment(); : Environment::systemEnvironment();
FilePath res = m_workingDirectory; FilePath res = m_workingDirectory;
const QString workingDir = m_workingDirectory.path(); QString workingDir = m_workingDirectory.path();
if (m_macroExpander)
workingDir = m_macroExpander->expandProcessArgs(workingDir);
res.setPath(PathChooser::expandedDirectory(workingDir, env, QString())); res.setPath(PathChooser::expandedDirectory(workingDir, env, QString()));
return res; return res;
} }