Commit afb54077 authored by hjk's avatar hjk
Browse files

debugger: fix some regressions in the log output after the engine refactoring

parent f538736c
......@@ -436,7 +436,6 @@ void DebuggerOutputWindow::showInput(int channel, const QString &input)
cursor.movePosition(QTextCursor::End);
m_inputText->setTextCursor(cursor);
m_inputText->ensureCursorVisible();
showOutput(LogInput, input);
}
void DebuggerOutputWindow::clearContents()
......
......@@ -2397,16 +2397,16 @@ void DebuggerPlugin::showMessage(const QString &msg, int channel, int timeout)
QTC_ASSERT(ow, return);
switch (channel) {
case StatusBar:
// This will append to ow's output pane, too.
d->showStatusMessage(msg, timeout);
ow->showOutput(LogStatus, msg);
break;
case LogMiscInput:
ow->showInput(LogMisc, msg);
ow->showOutput(LogMisc, msg);
break;
case LogInput:
ow->showInput(channel, msg);
ow->showOutput(channel, msg);
ow->showInput(LogInput, msg);
ow->showOutput(LogInput, msg);
break;
default:
ow->showOutput(channel, msg);
......
......@@ -461,10 +461,9 @@ void DebuggerRunControl::start()
}
plugin()->activateDebugMode();
showMessage(tr("Starting debugger for tool chain '%1'...")
.arg(toolChainName(sp.toolChainType)), LogStatus);
showMessage(DebuggerSettings::instance()->dump(), LogDebug);
plugin()->showMessage(tr("Starting debugger for tool chain '%1'...")
.arg(toolChainName(sp.toolChainType)), StatusBar);
plugin()->showMessage(DebuggerSettings::instance()->dump(), LogDebug);
engine()->startDebugger(this);
}
......
Markdown is supported
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