Merge remote-tracking branch 'origin/4.0'

Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I6217662f0c51d04a83f7a85dc5d7c7f25e78e09a
2016-05-13 16:24:37 +02:00
parent bd0b76b167 ae3b4f1a06
commit 6efd8e33e2
8 changed files with 58 additions and 20 deletions
@@ -1455,9 +1455,13 @@ class DumperBase:
                                self.put('keyencoded="latin1",')
                                self.putItem(v)
                                propertyCount += 1
-
-            self.putValue(str('<%s items>' % propertyCount if propertyCount else '<>0 items>'))
-            self.putNumChild(1)
+                self.putItemCount(propertyCount)
+            else:
+                # We need a handle to [x] for the user to expand the item
+                # before we know whether there are actual children. Counting
+                # them is too expensive.
+                self.putNumChild(1)
+                self.putSpecialValue("minimumitemcount", 0)

        with SubItem(self, "[methods]"):
            methodCount = self.staticQObjectMethodCount(smo)