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/items/qquickwindow.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/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index b5a68a2283..f517b5b3e9 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -2623,7 +2623,7 @@ void QQuickWindowPrivate::deliverMatchingPointsToItem(QQuickItem *item, QQuickPo auto mouseGrabber = q->mouseGrabberItem(); if (mouseGrabber && mouseGrabber != item && mouseGrabber != oldMouseGrabber) { item->mouseUngrabEvent(); - } else { + } else if (item->isEnabled() && item->isVisible()) { item->grabMouse(); } point->setAccepted(true); |