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

Debugger: Fix display of dynamic properties

Browse Source 
While the properties were dumped properly, only the number of
static properties was shown.

Change-Id: I3ccd98478e62d99849f5012121d2ff2bda500319
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2016-08-01 12:52:40 +02:00
committed by hjk
parent ceb883e56f
commit d5d449e421
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
share/qtcreator/debugger/dumper.py
View File

@@ -1702,9 +1702,9 @@ class DumperBase:
if isQMetaObject or isQObject: if isQMetaObject or isQObject:
with SubItem(self, "[properties]"): with SubItem(self, "[properties]"):
self.put('sortgroup="5"') self.put('sortgroup="5"')
self.putItemCount(propertyCount)
if self.isExpanded(): if self.isExpanded():
usesVector = self.qtVersion() >= 0x50700 usesVector = self.qtVersion() >= 0x50700
dynamicPropertyCount = 0
with Children(self): with Children(self):
# Static properties. # Static properties.
for i in range(propertyCount): for i in range(propertyCount):
@@ -1725,11 +1725,12 @@ class DumperBase:
else: else:
values = self.listChildrenGenerator(extraData + 2 * ptrSize, variantType) values = self.listChildrenGenerator(extraData + 2 * ptrSize, variantType)
for (k, v) in zip(names, values): for (k, v) in zip(names, values):
with SubItem(self, propertyCount): with SubItem(self, propertyCount + dynamicPropertyCount):
self.put('key="%s",' % self.encodeByteArray(k)) self.put('key="%s",' % self.encodeByteArray(k))
self.put('keyencoded="latin1",') self.put('keyencoded="latin1",')
self.putItem(v) self.putItem(v)
propertyCount += 1 dynamicPropertyCount += 1
self.putItemCount(propertyCount + dynamicPropertyCount)
else: else:
# We need a handle to [x] for the user to expand the item # We need a handle to [x] for the user to expand the item
# before we know whether there are actual children. Counting # before we know whether there are actual children. Counting