aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-01-30 17:04:42 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-02 08:16:43 +0100
commitba2b28fb849b80a0f2f8f4cffb6a774d0e6ff287 (patch)
tree6b73a5fa7af920dbfe5296ef2e91d6426217e008 /src/quick
parentfd7fce388e31174a5179d92b56911d974bf11024 (diff)
Fix unhandled touch events not being ignored.
Unhandled touch events need to be ignored in order for things like mouse event synthetization in QtGui to work. Change-Id: I6fe9dad205c8bb8547d2424c2e2a3b3518598006 Reviewed-by: Andras Becsi <andras.becsi@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/qquickcanvas.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp
index 5aa244c4a8..8f4078d63e 100644
--- a/src/quick/items/qquickcanvas.cpp
+++ b/src/quick/items/qquickcanvas.cpp
@@ -1063,6 +1063,8 @@ bool QQuickCanvasPrivate::deliverTouchEvent(QTouchEvent *event)
deliverTouchPoints(rootItem, event, event->touchPoints(), &acceptedNewPoints, &updatedPoints);
if (acceptedNewPoints.count() > 0)
event->accept();
+ else
+ event->ignore();
return event->isAccepted();
}
@@ -1095,7 +1097,10 @@ bool QQuickCanvasPrivate::deliverTouchEvent(QTouchEvent *event)
deliverTouchPoints(rootItem, event, newPoints, &acceptedNewPoints, &updatedPoints);
if (acceptedNewPoints.count() > 0 || updatedPoints.count() != prevCount)
event->accept();
- }
+ else
+ event->ignore();
+ } else
+ event->ignore();
if (event->touchPointStates() & Qt::TouchPointReleased) {
for (int i=0; i<touchPoints.count(); i++) {