diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-25 17:56:33 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-25 17:56:33 (GMT) |
commit | 5422e929cad04633a06c156cba96cfcd69262522 (patch) | |
tree | afb3c9b76c05d80238a1ff76f4e8f4019fac1651 /src/declarative/graphicsitems/qdeclarativeflickable.cpp | |
parent | ac798c5d77c59ea8dfe29c9d1896fb6604e3a628 (diff) | |
parent | a0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40 (diff) | |
download | Qt-5422e929cad04633a06c156cba96cfcd69262522.zip Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.gz Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.bz2 |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
configure
src/network/bearer/bearer.pri
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable.cpp')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index db63cda..d35718b 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -299,7 +299,7 @@ void QDeclarativeFlickablePrivate::fixup(AxisData &data, qreal minExtent, qreal timeline.move(data.move, maxExtent - dist/2, QEasingCurve(QEasingCurve::InQuad), fixupDuration/4); timeline.move(data.move, maxExtent, QEasingCurve(QEasingCurve::OutExpo), 3*fixupDuration/4); } else { - timeline.set(data.move, minExtent); + timeline.set(data.move, maxExtent); } } vTime = timeline.time(); |