diff options
Diffstat (limited to 'src/testlib/qsignaldumper.cpp')
| -rw-r--r-- | src/testlib/qsignaldumper.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp index 8305c5d424..d0b6d0dd3f 100644 --- a/src/testlib/qsignaldumper.cpp +++ b/src/testlib/qsignaldumper.cpp @@ -87,7 +87,7 @@ static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv str += objname.toLocal8Bit(); if (!objname.isEmpty()) str += ' '; - str += QByteArray::number(quintptr(caller), 16); + str += QByteArray::number(quintptr(caller), 16).rightJustified(8, '0'); str += ") "; str += member.name(); @@ -105,7 +105,7 @@ static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv str += '@'; quintptr addr = quintptr(*reinterpret_cast<void **>(argv[i + 1])); - str.append(QByteArray::number(addr, 16)); + str.append(QByteArray::number(addr, 16).rightJustified(8, '0')); } else if (typeId != QMetaType::UnknownType) { Q_ASSERT(typeId != QMetaType::Void); // void parameter => metaobject is corrupt str.append(arg) @@ -144,7 +144,7 @@ static void qSignalDumperCallbackSlot(QObject *caller, int method_index, void ** str += objname.toLocal8Bit(); if (!objname.isEmpty()) str += ' '; - str += QByteArray::number(quintptr(caller), 16); + str += QByteArray::number(quintptr(caller), 16).rightJustified(8, '0'); str += ") "; str += member.methodSignature(); @@ -170,13 +170,12 @@ void QSignalDumper::startDump() { static QSignalSpyCallbackSet set = { QTest::qSignalDumperCallback, QTest::qSignalDumperCallbackSlot, QTest::qSignalDumperCallbackEndSignal, 0 }; - qt_register_signal_spy_callbacks(set); + qt_register_signal_spy_callbacks(&set); } void QSignalDumper::endDump() { - static QSignalSpyCallbackSet nset = { 0, 0, 0 ,0 }; - qt_register_signal_spy_callbacks(nset); + qt_register_signal_spy_callbacks(nullptr); } void QSignalDumper::ignoreClass(const QByteArray &klass) |