diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-24 09:20:08 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-27 12:02:27 +0000 |
commit | 3b58d9814fedd0e679e195b45e3299df1cbf7688 (patch) | |
tree | f71144860ad66c21563e0ad0465458bc59d29a2a /src/plugins/platforms/windows/qwindowspointerhandler.h | |
parent | b88dd5490b4bcec320639cfd36518eadfaabcccd (diff) |
Windows QPA: Pass device for synthesized touch/tablet events
Add the overloads for mouse events with device/without timestamp
and pass the active tablet or touch device.
Task-number: QTBUG-88678
Task-number: QTBUG-46412
Change-Id: I8695b493540d0cbf50e9c72afe870a7633de3ab9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit d3caea04dc6c3a7072a43294b70bec860c199bf1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowspointerhandler.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowspointerhandler.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.h b/src/plugins/platforms/windows/qwindowspointerhandler.h index 6b02412e74..5b6179b7fa 100644 --- a/src/plugins/platforms/windows/qwindowspointerhandler.h +++ b/src/plugins/platforms/windows/qwindowspointerhandler.h @@ -86,6 +86,7 @@ private: QPointingDevicePtr m_touchDevice; #if QT_CONFIG(tabletevent) QList<QPointingDevicePtr> m_tabletDevices; + QPointingDevicePtr m_activeTabletDevice; #endif QHash<int, QPointF> m_lastTouchPositions; QHash<DWORD, int> m_touchInputIDToTouchPointID; |