From 77fd8fd9977b987c99acba6417ac369a9975d989 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 16 Apr 2012 01:17:00 +0200 Subject: Show the type and address of QObjects in debug output. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9f44ab80a6fb763adc9cbaf47de8e1b97212332d Reviewed-by: Jędrzej Nowacki --- tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/auto/corelib/kernel') diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 1e382dde3a..6a6460d17b 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -3666,6 +3666,11 @@ protected: // Chars insert '\0' into the qdebug stream, it is not possible to find a real string length return; } + if (QMetaType::typeFlags(currentId) & QMetaType::PointerToQObject) { + QByteArray currentName = QMetaType::typeName(currentId); + currentName.chop(1); + ok &= (msg.contains(", " + currentName) || msg.contains(", 0x0")); + } ok &= msg.endsWith(") "); QVERIFY2(ok, (QString::fromLatin1("Message is not correctly finished: '") + msg + '\'').toLatin1().constData()); @@ -3694,6 +3699,7 @@ void tst_QVariant::debugStream_data() QTest::newRow("CustomStreamableClass") << QVariant(qMetaTypeId(), 0) << qMetaTypeId(); QTest::newRow("MyClass") << QVariant(qMetaTypeId(), 0) << qMetaTypeId(); QTest::newRow("InvalidVariant") << QVariant() << int(QMetaType::UnknownType); + QTest::newRow("CustomQObject") << QVariant::fromValue(this) << qMetaTypeId(); } void tst_QVariant::debugStream() -- cgit v1.2.3