summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-03-26 01:08:38 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-03-26 01:08:38 (GMT)
commit4e5b463542385f4f4b3fc640926988dfb949ce54 (patch)
tree8b075fde6b1a05203de19efd635e66434b9a5abb /src
parentc2928bfdb467d7c54a97a71b6a1169db02e623fe (diff)
downloadQt-4e5b463542385f4f4b3fc640926988dfb949ce54.zip
Qt-4e5b463542385f4f4b3fc640926988dfb949ce54.tar.gz
Qt-4e5b463542385f4f4b3fc640926988dfb949ce54.tar.bz2
Really fix qMin() parameter types.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativepathview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index c98b006..783387c 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -772,7 +772,7 @@ void QDeclarativePathView::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
qreal v2 = velocity*velocity;
qreal accel = d->deceleration;
// + 0.25 to encourage moving at least one item in the flick direction
- qreal dist = qMin(qreal(d->model->count()-1), qreal(d->model->count()) * v2 / (accel * 2.0) + 0.25);
+ qreal dist = qMin(qreal(d->model->count()-1), qreal(qreal(d->model->count()) * v2 / (accel * 2.0) + 0.25));
// round to nearest item.
if (velocity > 0.)
dist = qRound(dist + d->offset) - d->offset;