diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 15:20:50 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 15:21:47 +0200 |
| commit | afcbdccbe7be5446f693a84cdf1886fe92a2e033 (patch) | |
| tree | 550d9ce3f11d95ee5a355f32a232c083cfe0304c /src/quick/items/qquickwindow_p.h | |
| parent | 23a3018fc6a1e650b7eb291009c20d46c9e5c9af (diff) | |
| parent | 7434d05cc102f27d36b8efccb4e37f20a4886ea9 (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Contains the fix for tst_TouchMouse::hoverEnabled which has caused
numerous failures in the last few days.
Change-Id: I1e523087a53d1df0334d602e4125f5cddc9bf470
Diffstat (limited to 'src/quick/items/qquickwindow_p.h')
| -rw-r--r-- | src/quick/items/qquickwindow_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index be915903c6..b3ff5a2b35 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -162,6 +162,10 @@ public: void flushFrameSynchronousEvents(); void deliverDelayedTouchEvent(); + // the device-specific event instances which are reused during event delivery + mutable QVector<QQuickPointerEvent *> pointerEventInstances; + QQuickPointerEvent *pointerEventInstance(QQuickPointerDevice *device) const; + // delivery of pointer events: QQuickPointerEvent *pointerEventInstance(QEvent *ev) const; void deliverPointerEvent(QQuickPointerEvent *); |