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

debugger: fix dumpers for QSharedPointer and QWeakPointer for the isNull() case

Browse Source 
(cherry picked from commit e195159f16)
This commit is contained in:
hjk
2009-08-26 16:49:05 +02:00
committed by con
parent fde1783b47
commit 91c9e66731
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
share/qtcreator/gdbmacros/gdbmacros.cpp
View File

@@ -2612,6 +2612,14 @@ static void qDumpQSharedPointer(QDumper &d)
const QSharedPointer<int> &ptr = const QSharedPointer<int> &ptr =
*reinterpret_cast<const QSharedPointer<int> *>(d.data); *reinterpret_cast<const QSharedPointer<int> *>(d.data);
if (ptr.isNull()) {
d.putItem("value", "<null>");
d.putItem("valuedisabled", "true");
d.putItem("numchild", 0);
d.disarm();
return;
}
if (isSimpleType(d.innertype)) if (isSimpleType(d.innertype))
qDumpInnerValueHelper(d, d.innertype, ptr.data()); qDumpInnerValueHelper(d, d.innertype, ptr.data());
else else
@@ -2768,6 +2776,15 @@ static void qDumpQWeakPointer(QDumper &d)
{ {
const int v = sizeof(void *); const int v = sizeof(void *);
const void *value = deref(addOffset(d.data, v)); const void *value = deref(addOffset(d.data, v));
const void *data = deref(d.data);
if (value == 0 || data == 0) {
d.putItem("value", "<null>");
d.putItem("valuedisabled", "true");
d.putItem("numchild", 0);
d.disarm();
return;
}
if (isSimpleType(d.innertype)) if (isSimpleType(d.innertype))
qDumpInnerValueHelper(d, d.innertype, value); qDumpInnerValueHelper(d, d.innertype, value);