diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-08 01:02:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-08 01:02:11 +0100 |
| commit | 92f2447cf3850303f161271c049a5b8d0a55b9f5 (patch) | |
| tree | dd12533ea6b2883bbe40b1b359e379dfe8f8dfe7 /src/quick/items | |
| parent | 1aae51242ed3902efac9524360f678113087f159 (diff) | |
| parent | e04e5db13d2a1d03e4afe139fcc29e0ed5b1edab (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I92e477524c95cceed61882e494e478eb1f8991ce
Diffstat (limited to 'src/quick/items')
| -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); |