diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-05-06 23:16:10 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-05-08 15:07:41 +0200 |
| commit | a3c9fb78cb33c29d49dbe83d0525c5935e77beed (patch) | |
| tree | b01c7f709c3c48326b8d11503e5da4478b3666af /src/quick/items/qquickmultipointtoucharea.cpp | |
| parent | 93563959cd9e64087599a829fc7d6afe22d3b487 (diff) | |
| parent | cef5e9d385d0cf78e43e8ea41edf253b78f0ca13 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: Ia06843de255547174efa556b1ab76be4b4be4287
Diffstat (limited to 'src/quick/items/qquickmultipointtoucharea.cpp')
| -rw-r--r-- | src/quick/items/qquickmultipointtoucharea.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index 9b2b4daa58..54136b1bbf 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -176,8 +176,6 @@ void QQuickTouchPoint::setVelocity(const QVector2D &velocity) It is deprecated because a touch point is more correctly modeled as an ellipse, whereas this rectangle represents the outer bounds of the ellipse after \l rotation. - - \sa horizontalDiameter, verticalDiameter */ void QQuickTouchPoint::setArea(const QRectF &area) { @@ -1009,3 +1007,5 @@ QSGNode *QQuickMultiPointTouchArea::updatePaintNode(QSGNode *oldNode, UpdatePain } QT_END_NAMESPACE + +#include "moc_qquickmultipointtoucharea_p.cpp" |