diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:41 +0200 |
| commit | 72f320a266d7f6e8055fdb57d0996363fcbc027a (patch) | |
| tree | aa4944c3d78267aa1d44b92605bbb0e475546d20 /src/quick/items/qquickwindow.cpp | |
| parent | a85ff0f11cce53244085cab8d947325099015725 (diff) | |
| parent | e41b519cfa8c9932b88db35b2d72588a13f19e4d (diff) | |
Merge dev into 5.10
Change-Id: I4376b711fbf02ea978f5d347d34a4a6a0c95dab2
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index cf64a94631..7073c711ee 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1678,8 +1678,9 @@ void QQuickWindowPrivate::deliverMouseEvent(QQuickPointerMouseEvent *pointerEven // if the grabber is an Item: // if the update consists of changing button state, don't accept it unless // the button is one in which the grabber is interested - if (pointerEvent->button() != Qt::NoButton && grabber->acceptedMouseButtons() - && !(grabber->acceptedMouseButtons() & pointerEvent->button())) { + Qt::MouseButtons acceptedButtons = grabber->acceptedMouseButtons(); + if (pointerEvent->button() != Qt::NoButton && acceptedButtons + && !(acceptedButtons & pointerEvent->button())) { pointerEvent->setAccepted(false); return; } |