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>
Wed, 27 Apr 2011 05:43:57 +0000 (15:43 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 27 Apr 2011 05:43:57 +0000 (15:43 +1000)
commitf8fea6f3b8fd3a1baa256130b23efc9e67a40e21
treec9eee3ff39000816113bcab3a5c035da97c2a9fc
parent415951891cd75170f1e4b89b46effa3319b56e4e
parent47712d1f330e4b22ce6dd30e7557288ef7f7fca0
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:
  Ignore changes to selectByMouse during a selection.
  PathView offset out of sync with currentIndex when items are removed.