diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-09-18 23:37:05 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-09-19 01:00:50 +0200 |
commit | b41753c356a9b0c3552d1879dd3e9952cdb11574 (patch) | |
tree | f260235180d376ebdae1b95e2ecb729ae7e7cb46 /tests/manual | |
parent | 4a2358f743471649dd615908dc5bea09633e5358 (diff) |
Fix the pointer handlers manual test again
InputInspector now has an unfortunate dependency on QPointingDevicePrivate,
which changed in qtbase/2692237bb1b0c0f50b7cc5d920eb8ab065063d47
(the final version ended up different than the version InputInspector
was modified for). Eventually maybe it can be rewritten with a
GrabMonitor like the one in tst_touchmouse; but for now it works again.
Amends a97759a336c597327cb82eebc9f45c793aec32c9
Change-Id: Ia8dca4a2021b5e62ed9932da33664a97b7fe0cd3
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/pointer/inputinspector.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/manual/pointer/inputinspector.cpp b/tests/manual/pointer/inputinspector.cpp index b919c489f4..ee1b4e70c0 100644 --- a/tests/manual/pointer/inputinspector.cpp +++ b/tests/manual/pointer/inputinspector.cpp @@ -141,9 +141,9 @@ QVector<QObject*> InputInspector::passiveGrabbers_helper(int pointId /*= 0*/) co QVector<QObject*> result; const QPointingDevice *device = pointerDevice(); if (device && source()) { - for (auto eventPoint : QPointingDevicePrivate::get(device)->activePoints) { - if (!pointId || eventPoint.id() == pointId) { - for (auto pg : eventPoint.passiveGrabbers()) { + for (auto &epd : QPointingDevicePrivate::get(device)->activePoints.values()) { + if (!pointId || epd.eventPoint.id() == pointId) { + for (auto pg : epd.passiveGrabbers) { if (!result.contains(pg)) result << pg; } @@ -158,9 +158,9 @@ QVector<QObject*> InputInspector::exclusiveGrabbers_helper(int pointId /*= 0*/) QVector<QObject*> result; const QPointingDevice *device = pointerDevice(); if (device && source()) { - for (auto eventPoint : QPointingDevicePrivate::get(device)->activePoints) { - if (!pointId || eventPoint.id() == pointId) { - if (auto g = eventPoint.exclusiveGrabber()) { + for (auto &epd : QPointingDevicePrivate::get(device)->activePoints.values()) { + if (!pointId || epd.eventPoint.id() == pointId) { + if (auto g = epd.exclusiveGrabber.data()) { if (!result.contains(g)) result << g; } |