diff options
author | Liang Qi <liang.qi@qt.io> | 2017-05-19 08:56:40 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-05-19 08:56:40 +0200 |
commit | 880b0d741477a56440cb3c2b57294b6748dbfd4c (patch) | |
tree | bb771541462ff1c7d899671510c9a2f653209cf6 /src/quick/items/qquickwindow.cpp | |
parent | 43d34fd6f96ed6b07fe79cf1637d5ec66cc97f4f (diff) | |
parent | ee6b07b3ce8ba80632868181d45d96253acb1064 (diff) |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: I52c591fff08a0cbf426aa53354850fb4b5f130c1
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index ff4a357641..67069c7d15 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -2117,8 +2117,10 @@ 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) + if (e->device() == device) { + device->m_event = e; return e; + } } QQuickPointerEvent *ev = nullptr; @@ -2136,6 +2138,7 @@ QQuickPointerEvent *QQuickWindowPrivate::pointerEventInstance(QQuickPointerDevic break; } pointerEventInstances << ev; + device->m_event = ev; return ev; } |