diff options
| author | aavit <qt-info@nokia.com> | 2011-05-06 07:30:14 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-05-06 07:30:14 (GMT) |
| commit | b81e1b76231dfe41de1857e87d4f6bf918c609a6 (patch) | |
| tree | ab5d96bd1299f426547e4845040f165bfd876fad /src/gui/util/qscroller.cpp | |
| parent | 7ac511d8d906575dff1a02361e31251b244d3b3a (diff) | |
| parent | 1d9a18142eb19d5dde93b7e5c63f9be0e4caf896 (diff) | |
| download | Qt-b81e1b76231dfe41de1857e87d4f6bf918c609a6.zip Qt-b81e1b76231dfe41de1857e87d4f6bf918c609a6.tar.gz Qt-b81e1b76231dfe41de1857e87d4f6bf918c609a6.tar.bz2 | |
Merge remote branch 'qt-mainline/4.8'
Diffstat (limited to 'src/gui/util/qscroller.cpp')
| -rw-r--r-- | src/gui/util/qscroller.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/util/qscroller.cpp b/src/gui/util/qscroller.cpp index db128c1..870d56f 100644 --- a/src/gui/util/qscroller.cpp +++ b/src/gui/util/qscroller.cpp @@ -1777,10 +1777,7 @@ void QScrollerPrivate::setState(QScroller::State newstate) */ void QScrollerPrivate::setContentPositionHelperDragging(const QPointF &deltaPos) { - Q_Q(QScroller); - QPointF ppm = q->pixelPerMeter(); const QScrollerPropertiesPrivate *sp = properties.d.data(); - QPointF v = q->velocity(); if (sp->overshootDragResistanceFactor) overshootPosition /= sp->overshootDragResistanceFactor; |