Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 25 May 2011 16:05:33 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 25 May 2011 16:05:33 +0000 (02:05 +1000)
commitc09b481edd82942cdc85d138c2160004bd71a54e
treeb66f9772d73b61e61b001448f5567ed77055a389
parent5a4df38ac98aa013bcfaddc8470bc1a7bae4449e
parentdf3691a0709af1706375772f5b68b0862ffb2d58
Merge branch 4.7 into qt-4.8-from-4.7
src/declarative/graphicsitems/qdeclarativeflickable.cpp