diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-04 01:00:40 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-04 01:00:41 +0100 |
| commit | af9a96ca10e72517a7e8aa1ada7ec2d635e2a9ff (patch) | |
| tree | 4b36daf460954c7c81f46acedae5409f3ac6a0a2 /src/quick/items/qquickmousearea.cpp | |
| parent | 8c0fb7679c34281b7ed48e466a7eb72885c088e7 (diff) | |
| parent | 705e80b702d752633828be9ac9467090e6541c66 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4e4464d785c8c4a0d06ffaaff3e1cdd94e1c179a
Diffstat (limited to 'src/quick/items/qquickmousearea.cpp')
| -rw-r--r-- | src/quick/items/qquickmousearea.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp index 24042da2a9..57d55172e3 100644 --- a/src/quick/items/qquickmousearea.cpp +++ b/src/quick/items/qquickmousearea.cpp @@ -942,6 +942,12 @@ void QQuickMouseArea::mouseUngrabEvent() ungrabMouse(); } +void QQuickMouseArea::touchUngrabEvent() +{ + // allow a Pointer Handler to steal the grab from MouseArea + ungrabMouse(); +} + bool QQuickMouseArea::sendMouseEvent(QMouseEvent *event) { Q_D(QQuickMouseArea); |