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

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

Browse Source
This commit is contained in:
Friedemann Kleint
2011-02-28 11:48:33 +01:00
parent 803add0e61
commit e5e202a96e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -575,7 +575,8 @@ bool CdbEngine::startConsole(const DebuggerStartParameters &sp, QString *errorMe
connect(m_consoleStub.data(), SIGNAL(wrapperStopped()),
SLOT(consoleStubExited()));
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)) {
*errorMessage = tr("The console process '%1' could not be started.").arg(sp.executable);
return false;
@@ -738,7 +739,10 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
showMessage(msg, LogMisc);
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())
m_process.setWorkingDirectory(sp.workingDirectory);