diff options
| author | hjk <qtc-committer@nokia.com> | 2009-08-20 15:11:12 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-08-21 10:24:40 +0200 |
| commit | 190f0ab1edaab3dcc5ebb48ecf8438ca9f8f7ecc (patch) | |
| tree | 661feb7bd9735b0f44d7e406d61ab9da2d1c3ef2 | |
| parent | 39c1755b3d471c625d9ae7366ab80d094c6d3895 (diff) | |
debugger: small fixes in the QObject dumper and autotest
(cherry picked from commit d79e8dc342d3a5bd75f82ad42b848dc670372ee5)
| -rw-r--r-- | share/qtcreator/gdbmacros/gdbmacros.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/debugger/main.cpp | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp index 497e25b7834..5d2bc781ea7 100644 --- a/share/qtcreator/gdbmacros/gdbmacros.cpp +++ b/share/qtcreator/gdbmacros/gdbmacros.cpp @@ -2272,7 +2272,7 @@ static void qDumpQObjectMethodList(QDumper &d) static const char *qConnectionType(uint type) { Qt::ConnectionType connType = static_cast<Qt::ConnectionType>(type); - const char *output; + const char *output = "unknown"; switch (connType) { case Qt::AutoConnection: output = "auto"; break; case Qt::DirectConnection: output = "direct"; break; @@ -2315,8 +2315,7 @@ static inline void qDumpQObjectConnectionPart(QDumper &d, d.put(number).put(namePostfix); d.endItem(); if (partner == owner) { - d.putItem("value", QLatin1String("<this>")); - d.putItem("valueencoded", "2"); + d.putItem("value", "<this>"); d.putItem("type", owner->metaObject()->className()); d.putItem("numchild", 0); d.putItem("addr", owner); diff --git a/tests/auto/debugger/main.cpp b/tests/auto/debugger/main.cpp index 6d52952e406..55d25220672 100644 --- a/tests/auto/debugger/main.cpp +++ b/tests/auto/debugger/main.cpp @@ -1788,7 +1788,7 @@ void tst_Debugger::dumpQObjectSignalHelper(QObject &o, int sigNum) const QString iStr = QString::number(i); expected.append("{name='").append(iStr).append(" receiver',"); if (conn->receiver == &o) - expected.append("value='").append(utfToBase64("<this>")). + expected.append("value='").append("<this>"). append("',valueencoded='2',type='").append(o.metaObject()->className()). append("',numchild='0',addr='").append(ptrToBa(&o)).append("'"); else if (conn->receiver == 0) @@ -1954,11 +1954,9 @@ void tst_Debugger::dumpQObjectSlotHelper(QObject &o, int slot) if (conn->receiver == &o && conn->method == slot) { ++numChild; const QMetaMethod &method = sender->metaObject()->method(signal); - if (numChild > 0) - expected.append(","); expected.append("{name='").append(senderNumStr).append(" sender',"); if (sender == &o) { - expected.append("value='").append(utfToBase64("<this>")). + expected.append("value='").append("<this>"). append("',type='").append(o.metaObject()->className()). append("',numchild='0',addr='").append(ptrToBa(&o)).append("'"); } else if (sender != 0) { |