Merge "Merge remote-tracking branch 'origin/5.0'"

This commit is contained in:
The Qt Project
2021-09-01 10:56:08 +00:00
43 changed files with 257 additions and 119 deletions

View File

@@ -697,11 +697,10 @@ void QtcProcess::start()
qWarning("QtcProcess::start: Empty environment set when running '%s'.",
qPrintable(d->m_commandLine.executable().toString()));
env = d->m_environment;
d->m_process->setProcessEnvironment(env.toProcessEnvironment());
} else {
env = Environment::systemEnvironment();
}
d->m_process->setProcessEnvironment(env.toProcessEnvironment());
d->m_process->setWorkingDirectory(d->m_workingDirectory.path());