aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickmultipointtoucharea.cpp
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den.exter@jolla.com>2015-09-15 15:26:48 +1000
committerAndrew den Exter <andrew.den.exter@qinetic.com.au>2015-09-15 05:52:17 +0000
commite6b0f29159d00f3e0273cd890a684e49e8e57751 (patch)
treee5ab187cba0cab0c26a3acf51f14b42738dbdf2c /src/quick/items/qquickmultipointtoucharea.cpp
parentc34d01166af6862db0f583f7b0d5e1754cf424ee (diff)
Handle TouchCancel events in MultiPointTouchArea.
Ensure canceled has been emitted and the touch point press states have been reset after a touch cancel event. Change-Id: I421e8e4bdc6793b5ddc4b905ffecef91cf61ed9d Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
Diffstat (limited to 'src/quick/items/qquickmultipointtoucharea.cpp')
-rw-r--r--src/quick/items/qquickmultipointtoucharea.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index e6b63d32f2..13ace44f9a 100644
--- a/src/quick/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -451,6 +451,12 @@ void QQuickMultiPointTouchArea::touchEvent(QTouchEvent *event)
}
break;
}
+ case QEvent::TouchCancel:
+ _stealMouse = false;
+ setKeepMouseGrab(false);
+ setKeepTouchGrab(false);
+ ungrabTouchPoints();
+ break;
default:
QQuickItem::touchEvent(event);
break;