diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-07 01:01:54 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-07 01:01:55 +0100 |
| commit | e04e5db13d2a1d03e4afe139fcc29e0ed5b1edab (patch) | |
| tree | ca450c633cbce2c86293b302d6e448e652e0136b /src/quick/handlers/qquickmultipointhandler.cpp | |
| parent | 6a7c8749712c33e27cdbc93efdf54eddf8e7631f (diff) | |
| parent | 895302829b46e00cde8eef13eb7c630af5d771e2 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1
Change-Id: I5209d833e171c795556c075e2a5f964b59b6df2e
Diffstat (limited to 'src/quick/handlers/qquickmultipointhandler.cpp')
| -rw-r--r-- | src/quick/handlers/qquickmultipointhandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/handlers/qquickmultipointhandler.cpp b/src/quick/handlers/qquickmultipointhandler.cpp index 228c99bb12..baa68e5e53 100644 --- a/src/quick/handlers/qquickmultipointhandler.cpp +++ b/src/quick/handlers/qquickmultipointhandler.cpp @@ -162,6 +162,10 @@ QVector<QQuickEventPoint *> QQuickMultiPointHandler::eligiblePoints(QQuickPointe bool stealingAllowed = event->isPressEvent() || event->isReleaseEvent(); for (int i = 0; i < c; ++i) { QQuickEventPoint *p = event->point(i); + if (QQuickPointerMouseEvent *me = event->asPointerMouseEvent()) { + if (me->buttons() == Qt::NoButton) + continue; + } if (!stealingAllowed) { QObject *exclusiveGrabber = p->exclusiveGrabber(); if (exclusiveGrabber && exclusiveGrabber != this && !canGrab(p)) |