summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-06-16 06:33:19 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-06-18 02:46:18 (GMT)
commitef6d2ab56754eac8d65bc7a1c851a840f129fa87 (patch)
treebde19808c528148a608cfbede6d66dec13f34d37 /src/declarative
parent7b1822dad8091e69a5c0eafb489444d2b7552a5e (diff)
downloadQt-ef6d2ab56754eac8d65bc7a1c851a840f129fa87.zip
Qt-ef6d2ab56754eac8d65bc7a1c851a840f129fa87.tar.gz
Qt-ef6d2ab56754eac8d65bc7a1c851a840f129fa87.tar.bz2
Stopping a flick resulted in the next click being consumed.
Task-number: QTBUG-11390 (cherry picked from commit cfbca0bd925b76fff533dc093c67ad72dbd73de5)
Diffstat (limited to 'src/declarative')
-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();