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

Debugger: Use shared TerminalRunner also for CDB

Browse Source 
Task-number: QTCREATORBUG-19633
Change-Id: Ic16335de1c5e57da7d9253772bad9e4ade1db926
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
David Schulz
2018-01-29 08:14:40 +01:00
committed by hjk
parent 860b89b49c
commit 43f02573df
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -365,7 +365,13 @@ void DebuggerRunTool::setBreakOnMain(bool on)
void DebuggerRunTool::setUseTerminal(bool on) void DebuggerRunTool::setUseTerminal(bool on)
{ {
if (on && !d->terminalRunner && m_runParameters.cppEngineType == GdbEngineType) { // CDB has a built-in console that might be preferred by some.
bool useCdbConsole = m_runParameters.cppEngineType == CdbEngineType
&& (m_runParameters.startMode == StartInternal
|| m_runParameters.startMode == StartExternal)
&& boolSetting(UseCdbConsole);
if (on && !d->terminalRunner && !useCdbConsole) {
d->terminalRunner = new TerminalRunner(this); d->terminalRunner = new TerminalRunner(this);
addStartDependency(d->terminalRunner); addStartDependency(d->terminalRunner);
} }
@@ -891,15 +897,6 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit, bool allowTer
m_engine = createPdbEngine(); m_engine = createPdbEngine();
} }
} }
if (m_runParameters.cppEngineType == CdbEngineType
&& !boolSetting(UseCdbConsole)
&& m_runParameters.inferior.runMode == ApplicationLauncher::Console
&& (m_runParameters.startMode == StartInternal
|| m_runParameters.startMode == StartExternal)) {
d->terminalRunner = new TerminalRunner(this);
addStartDependency(d->terminalRunner);
}
} }
DebuggerEngine *DebuggerRunTool::activeEngine() const DebuggerEngine *DebuggerRunTool::activeEngine() const