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, 14 Apr 2011 02:38:44 +0000 (12:38 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 14 Apr 2011 02:38:44 +0000 (12:38 +1000)
commit2980c4534b231c38584f88699d356ea26bb5266b
tree43c6ce757fa00f80c16355ee7c0d52a0ede11cf7
parent5d2d21377bfb99ddb69a27a05b7baab93d411f35
parentf6505f9f2eb4c594d3a249655879117e2a136468
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:
  Add pincharea.qmlproject file for PinchArea example.
  Moving contentY by large values in List/GridView is slow
src/declarative/graphicsitems/qdeclarativegridview.cpp