feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix 'Select widget to watch' on Windows.

Browse Source
This commit is contained in:
Friedemann Kleint
2011-01-17 16:33:31 +01:00
parent fb25e295ef
commit 51c4740266
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3731,23 +3731,24 @@ void GdbEngine::watchPoint(const QPoint &pnt)
void GdbEngine::handleWatchPoint(const GdbResponse &response) void GdbEngine::handleWatchPoint(const GdbResponse &response)
{ {
if (response.resultClass == GdbResultDone) { if (response.resultClass == GdbResultDone) {
const GdbMi contents = response.data.findChild("consolestreamoutput");
// "$5 = (void *) 0xbfa7ebfc\n" // "$5 = (void *) 0xbfa7ebfc\n"
const QByteArray ba = parsePlainConsoleStream(response); const QByteArray ba = parsePlainConsoleStream(response);
//qDebug() << "BA: " << ba; //qDebug() << "BA: " << ba;
const int posWidget = ba.indexOf("QWidget"); const int posWidget = ba.indexOf("QWidget");
const int posNs = ba.lastIndexOf(' ', posWidget) + 1;
const int pos0x = ba.indexOf("0x", posWidget + 7); const int pos0x = ba.indexOf("0x", posWidget + 7);
if (posWidget == -1 || posNs == 0 || pos0x == -1) { if (posWidget == -1 || pos0x == -1) {
showStatusMessage(tr("Cannot read widget data: %1").arg(_(ba))); showStatusMessage(tr("Cannot read widget data: %1").arg(_(ba)));
} else { } else {
const QByteArray addr = ba.mid(pos0x); const QByteArray addr = ba.mid(pos0x);
//const QByteArray ns = ba.mid(posNs, posWidget - posNs); if (addr.toULongLong(0, 0)) { // Non-null pointer
const QByteArray ns = qtNamespace(); const QByteArray ns = qtNamespace();
const QByteArray type = ns.isEmpty() ? "QWidget*" : ("'" + ns + "QWidget'*"); const QByteArray type = ns.isEmpty() ? "QWidget*" : ("'" + ns + "QWidget'*");
const QString exp = _("(*(struct %1)%2)").arg(_(type)).arg(_(addr)); const QString exp = _("(*(struct %1)%2)").arg(_(type)).arg(_(addr));
// qDebug() << posNs << posWidget << pos0x << addr << ns << type; // qDebug() << posNs << posWidget << pos0x << addr << ns << type;
watchHandler()->watchExpression(exp); watchHandler()->watchExpression(exp);
} else {
showStatusMessage(tr("Could not find a widget."));
}
} }
} }
} }