diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-01-07 12:38:35 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-13 14:17:47 +0000 |
commit | 49c47ac64e349ea7f5fe60d3afd728620a1f20c7 (patch) | |
tree | 41119f7d16e44bddfabe87b5433d75178153308c | |
parent | 2faab56a0337efa300c7bda0bfa7cb4026e57a82 (diff) |
QApplication: port manual users of QMutableEventPoint
... to new static setter API, which doesn't depend on undefined
behavior.
These users didn't use QMutableEventPoint::from(), but static_cast<>,
so they were only found when the non-static setters were removed,
locally.
Task-number: QTBUG-99615
Change-Id: I37faf17b2b180e0f6e8bb4e5f46951a2cc29678d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit 54945d58b3900767522f2625b3ec6a126b7401b3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index b1ec997e04..c7a39e8bee 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -3845,7 +3845,7 @@ QWidget *QApplicationPrivate::findClosestTouchPointTarget(const QPointingDevice if (closestTouchPointId == -1 || distance < closestDistance) { closestTouchPointId = pt.id(); closestDistance = distance; - closestTarget = static_cast<const QMutableEventPoint &>(pt).target(); + closestTarget = QMutableEventPoint::target(pt); } } } @@ -4016,7 +4016,7 @@ void QApplicationPrivate::translateTouchCancel(const QPointingDevice *device, ul const QPointingDevicePrivate *devPriv = QPointingDevicePrivate::get(device); for (auto &epd : devPriv->activePoints.values()) { const auto &pt = epd.eventPoint; - QObject *target = static_cast<const QMutableEventPoint &>(pt).target(); + QObject *target = QMutableEventPoint::target(pt); if (target && target->isWidgetType()) widgetsNeedingCancel.insert(static_cast<QWidget *>(target)); } |