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, 25 May 2011 08:54:29 +0000 (18:54 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 25 May 2011 08:54:29 +0000 (18:54 +1000)
commitdf3691a0709af1706375772f5b68b0862ffb2d58
treef1c97dced5c6ee2a2efd1d3b6c1115674c885b8d
parent864f6ce803b50740bf493092f939808e9e0a0c61
parent67ed18497705fa938728c505d165173dc5d3de68
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:
  Flickable could flick in wrong direction if given too few touch samples
src/declarative/graphicsitems/qdeclarativeflickable.cpp