forked from qt-creator/qt-creator
Utils: Continue Environment/EnvironmentChange consolidation
Make Environment a stack of changes that gets "expanded" to a full environment before things are actively accessed. Later this expansion should be done lazily if possible. Task-number: QTCREATORBUG-28357 Change-Id: If1c7bfdb9f58b81e71c51ed87ee75d6964a47019 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
@@ -246,6 +246,8 @@ void CallerHandle::start(const QString &program, const QStringList &arguments)
|
||||
p.command = m_command;
|
||||
p.arguments = m_arguments;
|
||||
p.env = m_setup->m_environment.toStringList();
|
||||
if (p.env.isEmpty())
|
||||
p.env = Environment::systemEnvironment().toStringList();
|
||||
p.workingDir = m_setup->m_workingDirectory.path();
|
||||
p.processMode = m_setup->m_processMode;
|
||||
p.writeData = m_setup->m_writeData;
|
||||
|
||||
Reference in New Issue
Block a user