Merge remote-tracking branch 'origin/5.0'

Change-Id: I712fce3cc0171327de122a1cd53b5bae67541084
2021-09-01 10:10:33 +02:00
parent 9891f3b268 913d034e52
commit 47de984972
43 changed files with 257 additions and 119 deletions
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -556,11 +556,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());