aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickwindow.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-05-31 08:12:24 +0200
committerLiang Qi <liang.qi@qt.io>2017-05-31 08:12:25 +0200
commit9f178cbe9ea27d247c82c7bbc396b1c3b264a06d (patch)
tree552cc5682fef1d046e9ad9394a22620bd380ad98 /src/quick/items/qquickwindow.cpp
parent344fbc3d2f4ccc9773e2bbe7b2969b4ac86dc9aa (diff)
parent96f6ba5f562073f508cd8569ac354592fdd48f4a (diff)
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
-rw-r--r--src/quick/items/qquickwindow.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 67069c7d15..ff4a357641 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -2117,10 +2117,8 @@ QQuickPointerEvent *QQuickWindowPrivate::pointerEventInstance(QQuickPointerDevic
{
// the list of devices should be very small so a linear search should be ok
for (QQuickPointerEvent *e: pointerEventInstances) {
- if (e->device() == device) {
- device->m_event = e;
+ if (e->device() == device)
return e;
- }
}
QQuickPointerEvent *ev = nullptr;
@@ -2138,7 +2136,6 @@ QQuickPointerEvent *QQuickWindowPrivate::pointerEventInstance(QQuickPointerDevic
break;
}
pointerEventInstances << ev;
- device->m_event = ev;
return ev;
}