diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-05-24 08:57:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-05-24 09:15:57 +0200 |
| commit | b254bbb82b7d1b42950c4267d8e618b570f88cc6 (patch) | |
| tree | c8f9fd1fcbd5c5d4a75ffea79ee623ce59e9ae9b /src/quick/items/qquickitem.cpp | |
| parent | 1b0e6861ba7af231c29ebba10c93976845f7f78d (diff) | |
| parent | 5b8a94eb8e5d4e3b79ab73a9a0325f838ecbe41a (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I0127f2c16de1d930bdd8cbccd42ec6785f31ab96
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index f02ad24c5b..73fc12babd 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -7462,11 +7462,8 @@ void QQuickItem::grabMouse() auto point = fromTouch ? windowPriv->pointerEventInstance(windowPriv->touchMouseDevice)->pointById(windowPriv->touchMouseId) : windowPriv->pointerEventInstance(QQuickPointerDevice::genericMouseDevice())->point(0); - if (point) { - QQuickItem *oldGrabber = point->grabberItem(); + if (point) point->setGrabberItem(this); - windowPriv->sendUngrabEvent(oldGrabber, fromTouch); - } } /*! |