Commit e5e202a9 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Debugger[CDB]: Do not set empty environment for 'Start external'.

parent 803add0e
...@@ -575,7 +575,8 @@ bool CdbEngine::startConsole(const DebuggerStartParameters &sp, QString *errorMe ...@@ -575,7 +575,8 @@ bool CdbEngine::startConsole(const DebuggerStartParameters &sp, QString *errorMe
connect(m_consoleStub.data(), SIGNAL(wrapperStopped()), connect(m_consoleStub.data(), SIGNAL(wrapperStopped()),
SLOT(consoleStubExited())); SLOT(consoleStubExited()));
m_consoleStub->setWorkingDirectory(sp.workingDirectory); m_consoleStub->setWorkingDirectory(sp.workingDirectory);
m_consoleStub->setEnvironment(sp.environment); if (sp.environment.size())
m_consoleStub->setEnvironment(sp.environment);
if (!m_consoleStub->start(sp.executable, sp.processArgs)) { if (!m_consoleStub->start(sp.executable, sp.processArgs)) {
*errorMessage = tr("The console process '%1' could not be started.").arg(sp.executable); *errorMessage = tr("The console process '%1' could not be started.").arg(sp.executable);
return false; return false;
...@@ -738,7 +739,10 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa ...@@ -738,7 +739,10 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
showMessage(msg, LogMisc); showMessage(msg, LogMisc);
m_outputBuffer.clear(); m_outputBuffer.clear();
m_process.setEnvironment(mergeEnvironment(sp.environment.toStringList(), extensionFi.absolutePath())); const QStringList environment = sp.environment.size() == 0 ?
QProcessEnvironment::systemEnvironment().toStringList() :
sp.environment.toStringList();
m_process.setEnvironment(mergeEnvironment(environment, extensionFi.absolutePath()));
if (!sp.workingDirectory.isEmpty()) if (!sp.workingDirectory.isEmpty())
m_process.setWorkingDirectory(sp.workingDirectory); m_process.setWorkingDirectory(sp.workingDirectory);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment