Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.
This commit is contained in:
Oswald Buddenhagen
2010-01-29 22:49:55 +01:00
302 changed files with 940 additions and 940 deletions

View File

@@ -225,10 +225,10 @@ def qdump__QFileInfo(d, item):
def qdump__QFlags(d, item):
#warn("QFLAGS: %s" % item.value)
#warn("QFLAGS: %s" % item.value)
i = item.value["i"]
enumType = item.value.type.template_argument(0)
#warn("QFLAGS: %s" % item.value["i"].cast(enumType))
#warn("QFLAGS: %s" % item.value["i"].cast(enumType))
d.putValue("%s (%s)" % (i.cast(enumType), i))
d.putNumChild(0)