diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-06-16 07:36:10 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-06-16 07:36:10 (GMT) |
| commit | 4ae3fd65f5f832a2b6a7463eb758cc0a5819ad9d (patch) | |
| tree | fc9d3c3042f64e604c14151540d1e72e58d3a097 | |
| parent | 1937adaab5861ced44813c6a4b0bff1c3750ecd3 (diff) | |
| parent | ec733c88ff54a2d7bebb0e5e471f40711ece3d5b (diff) | |
| download | Qt-4ae3fd65f5f832a2b6a7463eb758cc0a5819ad9d.zip Qt-4ae3fd65f5f832a2b6a7463eb758cc0a5819ad9d.tar.gz Qt-4ae3fd65f5f832a2b6a7463eb758cc0a5819ad9d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 1 |
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(); |