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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	src/plugins/cppeditor/cpphoverhandler.cpp
	src/plugins/cppeditor/cpphoverhandler.h
This commit is contained in:
hjk
2010-08-18 10:05:53 +02:00
parent 088e5fd5dc ffdd4110ae
commit b59fa0cd8b
24 changed files with 3852 additions and 7400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/gdbmacros/gdbmacros.py
View File

@@ -631,7 +631,6 @@ def qdump__QObject(d, item):
d.putNumChild(4)
if d.isExpanded(item):
with Children(d):
d.putFields(item)
# Parent and children.
if stripClassTag(str(item.value.type)) == d.ns + "QObject":
d.putItem(Item(d_ptr["parent"], item.iname, "parent", "parent"))