diff options
| author | Daniel d'Andrada <daniel.dandrada@luxoft.com> | 2017-10-09 17:39:44 +0200 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2018-04-09 03:36:36 +0000 |
| commit | 2597e43497aa8a223d65c669f07bd2e8fdf7e1f1 (patch) | |
| tree | 16c7b58d8fb1a2b87abf9833b2d5fb69b7be5980 /src/qml/qml/qqmltypeloader.cpp | |
| parent | 560360a1b7218865b71ae284dc920c38ffdd60d6 (diff) | |
Fix bug preventing ungrabMouse() on TouchCancel
The order matters. There won't be a mouseGrabberItem() after
the cancelExclusiveGrabImpl() call. So ungrab the mouse before
calling it, not after.
This cherry-pick includes some other changes to
tst_qquickwindow.cpp (parts of
9d8fe2ac121162c15be6728495be2235b728325a) that enable the
cherry-picked test function touchEvent_cancelClearsMouseGrab()
to be the same as it is in 5.10 branch.
Task-number: QTBUG-63680
Task-number: QTBUG-67445
Change-Id: I1ba6401c5d8eb3417907eb1e6ca20816b501f3ac
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry-picked from 0821180dc833376a738742e33f728983b9ca6f84)
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
0 files changed, 0 insertions, 0 deletions