aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2012-02-10 16:12:10 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-10 08:25:34 +0100
commit9634dc440269fc03f825a6d18b371d8e612ba9ec (patch)
tree9971973b8547bb80a2a8fc6acb196b1155fc0c36 /src/quick
parentdcd47afed9834f3503bb4c412603c20cb433cebb (diff)
Flickable containing PinchArea is unresponsive following pinch.
PinchArea was releasing the mouse grab when all touches were released, causing the mouse release event to not be propagated to its parents, who were then unable to correct their state. Remove this code and allow the normal event handlers to do their thing. Change-Id: I367772ca13546425fed4bed4438084bdf3c74dde Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/qquickpincharea.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index f50ca6d3fd..674abdcfd8 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -326,9 +326,6 @@ void QQuickPinchArea::updatePinch()
d->pinchRejected = false;
d->stealMouse = false;
setKeepMouseGrab(false);
- QQuickCanvas *c = canvas();
- if (c && c->mouseGrabberItem() == this)
- ungrabMouse();
return;
}
QTouchEvent::TouchPoint touchPoint1 = d->touchPoints.at(0);