diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-03 05:51:55 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-03 05:51:55 (GMT) |
| commit | fb6cf75abfae111ab2a1c968ffd0c9b707109b10 (patch) | |
| tree | f1a674e2b1740073075ecd86e6a01f5f31409ba5 | |
| parent | 135e8cd5be1b15a265f11f9e5dc99091d64dc090 (diff) | |
| download | Qt-fb6cf75abfae111ab2a1c968ffd0c9b707109b10.zip Qt-fb6cf75abfae111ab2a1c968ffd0c9b707109b10.tar.gz Qt-fb6cf75abfae111ab2a1c968ffd0c9b707109b10.tar.bz2 | |
Compile.
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsflickable.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp index df8c275..c4edb28 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp @@ -826,17 +826,17 @@ void QmlGraphicsFlickable::wheelEvent(QGraphicsSceneWheelEvent *event) QmlGraphicsItem::wheelEvent(event); } else if (yflick()) { if (event->delta() > 0) - d->velocityY = qMax(event->delta() - d->verticalVelocity.value(), 250.0); + d->velocityY = qMax(event->delta() - d->verticalVelocity.value(), qreal(250.0)); else - d->velocityY = qMin(event->delta() - d->verticalVelocity.value(), -250.0); + d->velocityY = qMin(event->delta() - d->verticalVelocity.value(), qreal(-250.0)); d->flicked = false; d->flickY(d->velocityY); event->accept(); } else if (xflick()) { if (event->delta() > 0) - d->velocityX = qMax(event->delta() - d->horizontalVelocity.value(), 250.0); + d->velocityX = qMax(event->delta() - d->horizontalVelocity.value(), qreal(250.0)); else - d->velocityX = qMin(event->delta() - d->horizontalVelocity.value(), -250.0); + d->velocityX = qMin(event->delta() - d->horizontalVelocity.value(), qreal(-250.0)); d->flicked = false; d->flickX(d->velocityX); event->accept(); |