Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 6 Jan 2011 09:28:55 +0000 (19:28 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 6 Jan 2011 09:28:55 +0000 (19:28 +1000)
commita6a8bee86f7e13d49d9115eb33aaee999bd15ad5
tree6965ebdba00a655ee879bc969986cd24753c6823
parent97e045f48a331ff97b87bd207fb811277a4fa695
parent05b9137fe1974aa123ce6d9c16b733e1f77d8269
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  PathView crashed when the path is provided with undefined values.
  PathView: update modelCount before attempting to regenerate delegates.