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

ProcessInterface: Use Environment and FilePath

Browse Source 
Use Utils::Environment for of environment.
Use Utils::FilePath for workingDirectory.

Change-Id: I6b717139f8ff7ddbd629fb22cf816b2303fb5e6a
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-02-14 15:54:04 +01:00
parent 95c9579c58
commit 6f1285f508
4 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/launchersocket.cpp
View File

@@ -376,7 +376,7 @@ void CallerHandle::start(const QString &program, const QStringList &arguments, c
p->command = m_command;
p->arguments = m_arguments;
p->env = m_environment.toStringList();
p->workingDir = m_workingDirectory;
p->workingDir = m_workingDirectory.path();
p->processMode = m_processMode;
p->writeData = m_writeData;
p->channelMode = m_channelMode;
@@ -456,13 +456,13 @@ void CallerHandle::setProcessChannelMode(QProcess::ProcessChannelMode mode)
m_channelMode = mode;
}
void CallerHandle::setProcessEnvironment(const QProcessEnvironment &environment)
void CallerHandle::setEnvironment(const Environment &environment)
{
QTC_ASSERT(isCalledFromCallersThread(), return);
m_environment = environment;
}
void CallerHandle::setWorkingDirectory(const QString &dir)
void CallerHandle::setWorkingDirectory(const FilePath &dir)
{
QTC_ASSERT(isCalledFromCallersThread(), return);
m_workingDirectory = dir;