Commit 190f0ab1 authored by hjk's avatar hjk Committed by con

debugger: small fixes in the QObject dumper and autotest

(cherry picked from commit d79e8dc3)
parent 39c1755b
......@@ -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);
......
......@@ -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) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment