summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-06-16 06:33:19 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-06-16 06:33:19 (GMT)
commitcfbca0bd925b76fff533dc093c67ad72dbd73de5 (patch)
tree7ebf08f9ec1cac34de9fea78a178b86f724b1294
parentc1e6d97b9476c859abc3927046144b4006fcf735 (diff)
downloadQt-cfbca0bd925b76fff533dc093c67ad72dbd73de5.zip
Qt-cfbca0bd925b76fff533dc093c67ad72dbd73de5.tar.gz
Qt-cfbca0bd925b76fff533dc093c67ad72dbd73de5.tar.bz2
Stopping a flick resulted in the next click being consumed.
Task-number: QTBUG-11390
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index fdc1444..6dfd4d9 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -1214,6 +1214,7 @@ bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
default:
break;
}
+ stealThisEvent = d->stealMouse; // Update stealThisEvent and grabber in case changed by function calls above
grabber = qobject_cast<QDeclarativeItem*>(s->mouseGrabberItem());
if (grabber && stealThisEvent && !grabber->keepMouseGrab() && grabber != this) {
d->clearDelayedPress();