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

Debugger: Merge prepareCommand

Browse Source 
Change-Id: Idd316a88ae39d563c99d3b4081f88fc41e604499
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2017-04-19 10:10:23 +02:00
parent 88897f3a87
commit 890e7546e4
6 changed files with 28 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/debugger/lldb/lldbengine.cpp
View File

@@ -176,25 +176,6 @@ void LldbEngine::abortDebugger()
}
}
// FIXME: Merge with GdbEngine/QtcProcess
bool LldbEngine::prepareCommand()
{
if (HostOsInfo::isWindowsHost()) {
DebuggerRunParameters &rp = runParameters();
QtcProcess::SplitError perr;
rp.inferior.commandLineArguments
= QtcProcess::prepareArgs(rp.inferior.commandLineArguments, &perr, HostOsInfo::hostOs(),
nullptr, &rp.inferior.workingDirectory).toWindowsArgs();
if (perr != QtcProcess::SplitOk) {
// perr == BadQuoting is never returned on Windows
// FIXME? QTCREATORBUG-2809
notifyEngineSetupFailed();
return false;
}
}
return true;
}
void LldbEngine::setupEngine()
{
// FIXME: We can't handle terminals yet.
@@ -226,10 +207,8 @@ void LldbEngine::setupEngine()
// m_stubProc.stop();
// m_stubProc.blockSignals(false);
if (!prepareCommand()) {
notifyEngineSetupFailed();
if (!prepareCommand())
return;
}
m_stubProc.setWorkingDirectory(runParameters().inferior.workingDirectory);
// Set environment + dumper preload.