feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Use a somewhat better fallback when no environment was set

Browse Source 
Change-Id: Ic92b7b2bf50ecfed4790393a763b17bb988e892c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2022-04-28 18:15:15 +02:00
parent cdae5bdebd
commit b971c27312
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/qtcprocess.cpp
View File

@@ -528,10 +528,13 @@ public:
{ {
Environment env; Environment env;
if (m_setup.m_haveEnv) { 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'.", qWarning("QtcProcess::start: Empty environment set when running '%s'.",
qPrintable(m_setup.m_commandLine.executable().toString())); qPrintable(m_setup.m_commandLine.executable().toString()));
env = m_setup.m_environment; env = Environment::systemEnvironment();
}
} else { } else {
env = Environment::systemEnvironment(); env = Environment::systemEnvironment();
} }