From afb54077f5f4bf576fa93074e803270fcb15ba70 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 30 Jun 2010 13:15:44 +0200
Subject: [PATCH] debugger: fix some regressions in the log output after the
engine refactoring
---
src/plugins/debugger/debuggeroutputwindow.cpp | 1 -
src/plugins/debugger/debuggerplugin.cpp | 6 +++---
src/plugins/debugger/debuggerrunner.cpp | 7 +++----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/plugins/debugger/debuggeroutputwindow.cpp b/src/plugins/debugger/debuggeroutputwindow.cpp
index 8b92763c802..d04460144da 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 3abb628df66..f08c4f5b647 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 d642beeb840..ae212ff8b44 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);
}
--
GitLab