From fb6cf75abfae111ab2a1c968ffd0c9b707109b10 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 3 Feb 2010 15:51:55 +1000 Subject: Compile. --- src/declarative/graphicsitems/qmlgraphicsflickable.cpp | 8 ++++---- 1 file 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(); -- cgit v0.12