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, 6 Apr 2011 05:30:18 +0000 (15:30 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 6 Apr 2011 05:30:18 +0000 (15:30 +1000)
commit8c6f2fdf09eb2998cb013659ca7a2154792ffa98
treec13bb27adf01e18cd3a8313343af9b2321b2dd61
parentdc7385b41bf81e6c12dbd3c33c2bea577e067970
parent160f1867868cdea916923652b00484ed11f90aaa
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:
  Improve Flickable dynamics and allow platform specific tweaking.
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp