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

Utils: Make QtcProcess::{setW,w}orkingDirectory use FilePath

Browse Source 
But keep the old setter for a while to ease transition.

Change-Id: If02b79b1fcd31fbf8b06ef26876c41af891127f9
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2021-06-03 10:39:15 +02:00
parent c956d02200
commit accb1e6e08
10 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -220,13 +220,12 @@ void AbstractProcessStep::doRun()
d->m_process.reset(new QtcProcess());
d->m_process->setUseCtrlCStub(HostOsInfo::isWindowsHost());
if (!wd.needsDevice()) // FIXME: Make QtcProcess take FilePath as working directory.
d->m_process->setWorkingDirectory(wd.toString());
d->m_process->setWorkingDirectory(wd);
// Enforce PWD in the environment because some build tools use that.
// PWD can be different from getcwd in case of symbolic links (getcwd resolves symlinks).
// For example Clang uses PWD for paths in debug info, see QTCREATORBUG-23788
Environment envWithPwd = d->m_param.environment();
envWithPwd.set("PWD", d->m_process->workingDirectory());
envWithPwd.set("PWD", d->m_process->workingDirectory().path());
d->m_process->setEnvironment(envWithPwd);
d->m_process->setCommand(effectiveCommand);
if (d->m_lowPriority && ProjectExplorerPlugin::projectExplorerSettings().lowBuildPriority)