diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-07-01 16:56:43 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-07-04 15:16:45 +0000 |
| commit | e7d6606e2d58774c98a1eda5bd879c92ffbbd23c (patch) | |
| tree | 392a25359f2dcc126cdd49a8ddc543f7e382910e /src/quick/items/qquickwindow_p.h | |
| parent | e00b9df034be846013fa83f0923f823cf6e988f0 (diff) | |
QQuickWindowPrivate::removeGrabber: take params for mouse and touch
QQuickItem::ungrabTouchPoints() wasn't intended to ungrab mouse
and QQuickItem::ungrabMouse() wasn't intended to ungrab touch.
This seems to make the tests more likely to pass.
Change-Id: I2d39028dc8267b7c8b0e1bac721f1a12014f0b25
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow_p.h')
| -rw-r--r-- | src/quick/items/qquickwindow_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index ac430f3e0c..3737f9efb8 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -143,7 +143,7 @@ public: bool translateTouchToMouse(QQuickItem *item, QTouchEvent *event); void translateTouchEvent(QTouchEvent *touchEvent); void setMouseGrabber(QQuickItem *grabber); - void removeGrabber(QQuickItem *grabber); + void removeGrabber(QQuickItem *grabber, bool mouse = true, bool touch = true); static void transformTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints, const QTransform &transform); static QMouseEvent *cloneMouseEvent(QMouseEvent *event, QPointF *transformedLocalPos = 0); bool deliverInitialMousePressEvent(QQuickItem *, QMouseEvent *); |