diff options
| author | hjk <qtc-committer@nokia.com> | 2009-05-29 16:24:46 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-05-29 16:25:12 +0200 |
| commit | ee5fb31f116d54c7acba063a0af25f61dedd34e2 (patch) | |
| tree | efaf123b961d500020f13876bc76cc3a087ea6ee /src/plugins | |
| parent | 82f6061a80615dc204ba9b2d569b91d7bd3cc2a1 (diff) | |
| download | qt-creator-ee5fb31f116d54c7acba063a0af25f61dedd34e2.tar.gz | |
debugger: re-start work on image dumper
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/debugger/debuggeroutputwindow.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/debugger/gdb/gdbengine.cpp | 14 | ||||
| -rw-r--r-- | src/plugins/debugger/watchhandler.cpp | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/src/plugins/debugger/debuggeroutputwindow.cpp b/src/plugins/debugger/debuggeroutputwindow.cpp index 9c51a5300c..d50536e7ca 100644 --- a/src/plugins/debugger/debuggeroutputwindow.cpp +++ b/src/plugins/debugger/debuggeroutputwindow.cpp @@ -252,8 +252,8 @@ void DebuggerOutputWindow::showOutput(const QString &prefix, const QString &outp foreach (QString line, output.split("\n")) { // FIXME: QTextEdit asserts on really long lines... const int n = 3000; - if (line.size() > n) - line = line.left(n) + " [...] <cut off>"; + //if (line.size() > n) + // line = line.left(n) + " [...] <cut off>"; m_combinedText->appendPlainText(prefix + line); } QTextCursor cursor = m_combinedText->textCursor(); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 36fb1d87ad..5d58778848 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -2776,10 +2776,12 @@ static void setWatchDataEditValue(WatchData &data, const GdbMi &mi) data.editvalue = mi.data(); } -static void setWatchDataValueToolTip(WatchData &data, const GdbMi &mi) +static void setWatchDataValueToolTip(WatchData &data, const GdbMi &mi, + int encoding = 0) { + qDebug() << "TOOLTIP: " << mi.data().size() << "ENC:" << encoding; if (mi.isValid()) - data.setValueToolTip(_(mi.data())); + data.setValueToolTip(decodeData(mi.data(), encoding)); } static void setWatchDataChildCount(WatchData &data, const GdbMi &mi) @@ -3375,7 +3377,8 @@ void GdbEngine::handleDebuggingHelperValue2(const GdbResultRecord &record, setWatchDataAddress(data, contents.findChild("addr")); setWatchDataSAddress(data, contents.findChild("saddr")); setWatchDataChildCount(data, contents.findChild("numchild")); - setWatchDataValueToolTip(data, contents.findChild("valuetooltip")); + setWatchDataValueToolTip(data, contents.findChild("valuetooltip"), + contents.findChild("valuetooltipencoded").data().toInt()); setWatchDataValueDisabled(data, contents.findChild("valuedisabled")); setWatchDataEditValue(data, contents.findChild("editvalue")); if (qq->watchHandler()->isDisplayedIName(data.iname)) { @@ -3422,7 +3425,8 @@ void GdbEngine::handleDebuggingHelperValue2(const GdbResultRecord &record, item.findChild("valueencoded").data().toInt()); setWatchDataAddress(data1, item.findChild("addr")); setWatchDataSAddress(data1, item.findChild("saddr")); - setWatchDataValueToolTip(data1, item.findChild("valuetooltip")); + setWatchDataValueToolTip(data1, item.findChild("valuetooltip"), + contents.findChild("valuetooltipencoded").data().toInt()); setWatchDataValueDisabled(data1, item.findChild("valuedisabled")); if (!qq->watchHandler()->isExpandedIName(data1.iname)) data1.setChildrenUnneeded(); @@ -3722,7 +3726,7 @@ void GdbEngine::handleVarListChildrenHelper(const GdbMi &item, } else if (exp == "staticMetaObject") { // && item.findChild("type").data() == "const QMetaObject") // FIXME: Namespaces? - // { do nothing } FIXME: make coinfigurable? + // { do nothing } FIXME: make configurable? // special "clever" hack to avoid clutter in the GUI. // I am not sure this is a good idea... } else { diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 421b22e9f1..103545bcf9 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -247,6 +247,8 @@ template <class Streamable> QString WatchData::toToolTip() const { + if (!valuetooltip.isEmpty()) + return QString::number(valuetooltip.size()); QString res; QTextStream str(&res); str << "<html><body><table>"; |