diff options
Diffstat (limited to 'src/gui/kernel/qeventpoint.cpp')
| -rw-r--r-- | src/gui/kernel/qeventpoint.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qeventpoint.cpp b/src/gui/kernel/qeventpoint.cpp index 4030ebce0c..66d4f44ea0 100644 --- a/src/gui/kernel/qeventpoint.cpp +++ b/src/gui/kernel/qeventpoint.cpp @@ -339,7 +339,7 @@ ulong QEventPoint::pressTimestamp() const /*! \property QEventPoint::timeHeld - \brief the duration, in milliseconds, since this point was pressed and not released. + \brief the duration, in seconds, since this point was pressed and not released. \sa pressTimestamp, timestamp */ @@ -430,6 +430,7 @@ QPointF QEventPoint::normalizedPosition() const return (globalPosition() - geom.topLeft()) / geom.width(); } +#if QT_DEPRECATED_SINCE(6, 0) /*! \deprecated [6.0] Use globalPressPosition() instead. @@ -467,7 +468,7 @@ QPointF QEventPoint::lastNormalizedPos() const return QPointF(); return (globalLastPosition() - geom.topLeft()) / geom.width(); } - +#endif // QT_DEPRECATED_SINCE(6, 0) /*! \internal This class is explicitly shared, which means if you construct an event and @@ -535,6 +536,7 @@ void QMutableEventPoint::update(const QEventPoint &other, QEventPoint &target) setEllipseDiameters(target, other.ellipseDiameters()); setRotation(target, other.rotation()); setVelocity(target, other.velocity()); + setUniqueId(target, other.uniqueId()); // for TUIO } /*! \internal |