Merge remote-tracking branch 'origin/5.0'

Change-Id: I9aa7b7a6490e8fb592a0e785a57128d438fdbab5
2021-07-27 11:09:09 +03:00
parent 764bf7396c 932d78c3e0
commit 61008441da
18 changed files with 135 additions and 13 deletions
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -496,6 +496,12 @@ void QtcProcess::setEnvironment(const Environment &env)
    d->m_haveEnv = true;
 }

+void QtcProcess::unsetEnvironment()
+{
+    d->m_environment = Environment();
+    d->m_haveEnv = false;
+}
+
 const Environment &QtcProcess::environment() const
 {
    return d->m_environment;