Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 5 Dec 2011 02:05:39 +0000 (12:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 5 Dec 2011 02:05:39 +0000 (12:05 +1000)
commit91814c0a9d32b5a306037a73c067c02d3f5be4ff
tree38f608f400527e1c8c14cc652faa1c3fc61392e8
parent46db88be9fb0b8951916d706c39e1079f38f277d
parent2cfbc2b874ebec52ee76adc60b51dca138827d8c
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  qmlplugindump: Fix missing flush for objects that don't fit a line.
  qmlplugindump: Avoid reporting types as attaching to themselves.