summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-11-04 05:07:24 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-11-04 05:07:24 (GMT)
commit80544a90d165736088b8286b738fd4e3033b1ade (patch)
tree3eeebe305f137f5bac397cfe43d6abc2237139b6 /src
parentc82f6af6055fe601a8671928bb4cb6f28b05605c (diff)
downloadQt-80544a90d165736088b8286b738fd4e3033b1ade.zip
Qt-80544a90d165736088b8286b738fd4e3033b1ade.tar.gz
Qt-80544a90d165736088b8286b738fd4e3033b1ade.tar.bz2
Fix regression in 648eb76c and update visual tests.
Once fixup() begins, flick should not be recalculated. Task-number: QTBUG-14821 Reviewed-by: Michael Brasser
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativelistview.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index eab66d8..94b1cb3 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1157,6 +1157,7 @@ void QDeclarativeListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
|| (orient == QDeclarativeListView::Vertical && &data == &hData))
return;
+ correctFlick = false;
int oldDuration = fixupDuration;
fixupDuration = moveReason == Mouse ? fixupDuration : 0;