debugger: fix merge errors

2010-08-23 17:24:36 +02:00
parent 46a1c26070
commit 49296ae135
2 changed files with 19 additions and 2 deletions
--- a/share/qtcreator/gdbmacros/gdbmacros.py
+++ b/share/qtcreator/gdbmacros/gdbmacros.py
@@ -704,8 +704,6 @@ def qdump__QObject(d, item):
                    # Static properties.
                    propertyData = metaData[7]
                    for i in xrange(staticPropertyCount):
-
-                    for property in xrange(propertyCount):
                        with SubItem(d):
                            offset = propertyData + 3 * i
                            propertyName = extractCString(metaStringData, metaData[offset])