From d42544e03746aec20f41afaffe681fe9286f556b Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Thu, 20 Jun 2013 09:31:15 +0200
Subject: [PATCH] Debugger: Enable mouse input/output navigation in LLDB log
window
Change-Id: Idee41c6c2769397d6eee3ab74de4afbb94111e25
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/plugins/debugger/lldb/lldbengine.cpp | 3 ++-
src/plugins/debugger/logwindow.cpp | 13 +++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 3009506d47e..486b3567719 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -826,7 +826,8 @@ void LldbEngine::readLldbStandardError()
void LldbEngine::readLldbStandardOutput()
{
QByteArray out = m_lldbProc.readAllStandardOutput();
- showMessage(_("Lldb stdout: " + out));
+ //showMessage(_("Lldb stdout: " + out));
+ showMessage(_(out), LogDebug);
m_inbuffer.append(out);
while (true) {
int pos = m_inbuffer.indexOf("@\n");
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index 5177150b4da..f54f1c5611d 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -306,13 +306,18 @@ public slots:
{
QString needle = QString::number(i) + QLatin1Char('^');
QString needle2 = QLatin1Char('>') + needle;
+ QString needle3 = QString::fromLatin1("dtoken(\"%1\")@").arg(i);
QTextCursor cursor(document());
do {
- cursor = document()->find(needle, cursor);
- if (cursor.isNull())
- break; // Not found.
+ QTextCursor newCursor = document()->find(needle, cursor);
+ if (newCursor.isNull()) {
+ newCursor = document()->find(needle3, cursor);
+ if (newCursor.isNull())
+ break; // Not found.
+ }
+ cursor = newCursor;
const QString line = cursor.block().text();
- if (line.startsWith(needle) || line.startsWith(needle2)) {
+ if (line.startsWith(needle) || line.startsWith(needle2) || line.startsWith(needle3)) {
setFocus();
setTextCursor(cursor);
ensureCursorVisible();
--
GitLab