diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-08-04 13:35:19 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-08-05 16:43:49 +0000 |
| commit | 1f4bfc099b7e48e2cc3dd9488b7b42a96122b299 (patch) | |
| tree | 13e6b01e4281f60a95685c4b1f5c40ac18c52b42 /src/quick/items/qquickwindow.cpp | |
| parent | c83c9a1f7ac7ff322f696d1119d4e9c06620e716 (diff) | |
QQuickWindowPrivate::deliverTouchAsMouse: don't pre-grab
Change-Id: I127d3e6dafbe4207941aef3f507b25c2cb7a251b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 172311d997..ec0c50f09d 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -644,8 +644,6 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve if (!item->contains(pos)) break; - auto pointerEventPoint = pointerEvent->pointById(p.id()); - pointerEventPoint->setGrabber(item); qCDebug(DBG_TOUCH_TARGET) << "TP (mouse)" << p.id() << "->" << item; QScopedPointer<QMouseEvent> mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event, item, false)); @@ -657,7 +655,8 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve touchMouseId = p.id(); if (!q->mouseGrabberItem()) item->grabMouse(); - item->grabTouchPoints(QVector<int>() << touchMouseId); + auto pointerEventPoint = pointerEvent->pointById(p.id()); + pointerEventPoint->setGrabber(item); if (checkIfDoubleClicked(event->timestamp())) { QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event, item, false)); |