diff options
| author | Aaron McCarthy <aaron.mccarthy@jollamobile.com> | 2015-02-18 15:53:09 +1000 |
|---|---|---|
| committer | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2015-02-24 01:12:26 +0000 |
| commit | 83a16630c13969e68cd3a5aaab73335ccb0d4414 (patch) | |
| tree | c6b4728ab016a19545bc826b54a2f3f64d378341 /src/quick/items/qquickpincharea_p.h | |
| parent | cb0243d5078dcd9cebb2ce89621e4912ff57cebf (diff) | |
Handle TouchCancel events in QQuickPinchArea
QQuickPinchArea did not handle TouchCancel events and would recursively
call QQuickItem::event(). Cancel the pinch gesture by restoring the
pinch state to the start state. Don't recursively call
QQuickItem::event(), instead call QQuickItem::touchEvent() for
unhandled touch events.
[ChangeLog][QtQuick][PinchArea] Fix infinite recursion when TouchCancel
events are received.
Change-Id: Ifce4af91aec4285873cb701069e007bcee180851
Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
Diffstat (limited to 'src/quick/items/qquickpincharea_p.h')
| -rw-r--r-- | src/quick/items/qquickpincharea_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h index 57f9a87e07..d2de59b5d6 100644 --- a/src/quick/items/qquickpincharea_p.h +++ b/src/quick/items/qquickpincharea_p.h @@ -279,6 +279,7 @@ protected: private: void clearPinch(); + void cancelPinch(); void updatePinch(); void updatePinchTarget(); void handlePress(); |