diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 18:19:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 18:19:49 (GMT) |
| commit | be6a0b58680213da42d956ed9d1c77103be24c93 (patch) | |
| tree | 125ea41fca985931014da8947341fdcbc71c4e65 | |
| parent | 9624d70e5588bb1f6b0c894288c8ec3d4b3246c6 (diff) | |
| parent | 6018c6138018eb322ccdc8f34516e77ee43ed83d (diff) | |
| download | Qt-be6a0b58680213da42d956ed9d1c77103be24c93.zip Qt-be6a0b58680213da42d956ed9d1c77103be24c93.tar.gz Qt-be6a0b58680213da42d956ed9d1c77103be24c93.tar.bz2 | |
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:
Remove unnecessary rounding
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 57ce4ce..b737785 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -483,7 +483,6 @@ qreal QDeclarativeFlickable::contentX() const void QDeclarativeFlickable::setContentX(qreal pos) { Q_D(QDeclarativeFlickable); - pos = qRound(pos); d->timeline.reset(d->hData.move); d->vTime = d->timeline.time(); movementXEnding(); @@ -502,7 +501,6 @@ qreal QDeclarativeFlickable::contentY() const void QDeclarativeFlickable::setContentY(qreal pos) { Q_D(QDeclarativeFlickable); - pos = qRound(pos); d->timeline.reset(d->vData.move); d->vTime = d->timeline.time(); movementYEnding(); |