From b971c2731247df84134038deea16db92d63a6961 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 28 Apr 2022 18:15:15 +0200 Subject: [PATCH] Utils: Use a somewhat better fallback when no environment was set Change-Id: Ic92b7b2bf50ecfed4790393a763b17bb988e892c Reviewed-by: Jarek Kobus --- src/libs/utils/qtcprocess.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 20b21526a62..4845cc8f4b8 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -528,10 +528,13 @@ public: { Environment env; if (m_setup.m_haveEnv) { - if (m_setup.m_environment.size() == 0) + if (m_setup.m_environment.size()) { + env = m_setup.m_environment; + } else { qWarning("QtcProcess::start: Empty environment set when running '%s'.", qPrintable(m_setup.m_commandLine.executable().toString())); - env = m_setup.m_environment; + env = Environment::systemEnvironment(); + } } else { env = Environment::systemEnvironment(); }