diff --git a/src/plugins/debugger/debuggeroutputwindow.cpp b/src/plugins/debugger/debuggeroutputwindow.cpp index 8b92763c8028988e56e04188a84dabaefa74dfec..d04460144dadfc25d3951cd1477fba2ddbf324d2 100644 --- a/src/plugins/debugger/debuggeroutputwindow.cpp +++ b/src/plugins/debugger/debuggeroutputwindow.cpp @@ -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() diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 3abb628df66add306925f469236f74040f6c02a2..f08c4f5b6476cc355e98bea3076369ec478ba9bd 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -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); diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index d642beeb84098f5c22d5fcb2c4daecce72edafcc..ae212ff8b44de9b4e1bec721c4193537946f7995 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -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); }