aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/quick/handlers/qquickdraghandler.cpp4
-rw-r--r--src/quick/handlers/qquickmultipointhandler.cpp9
-rw-r--r--src/quick/handlers/qquickpinchhandler.cpp2
3 files changed, 13 insertions, 2 deletions
diff --git a/src/quick/handlers/qquickdraghandler.cpp b/src/quick/handlers/qquickdraghandler.cpp
index d9f0e477d1..ffdaa909dd 100644
--- a/src/quick/handlers/qquickdraghandler.cpp
+++ b/src/quick/handlers/qquickdraghandler.cpp
@@ -81,7 +81,9 @@ Q_LOGGING_CATEGORY(lcDragHandler, "qt.quick.handler.drag")
a (default) single-finger DragHandler and a PinchHandler on the same Item,
and thus can be used to adjust some other feature independently of the
usual pinch behavior: for example adjust a tilt transformation, or adjust
- some other numeric value.
+ some other numeric value, if the \c target is set to null. But if the
+ \l target is an Item, \l centroid is the point at which the drag begins and
+ to which the \c target will be moved (subject to constraints).
At this time, drag-and-drop is not yet supported.
diff --git a/src/quick/handlers/qquickmultipointhandler.cpp b/src/quick/handlers/qquickmultipointhandler.cpp
index 5606162f15..cb3becaa2d 100644
--- a/src/quick/handlers/qquickmultipointhandler.cpp
+++ b/src/quick/handlers/qquickmultipointhandler.cpp
@@ -329,4 +329,13 @@ void QQuickMultiPointHandler::moveTarget(QPointF pos)
m_centroid.m_position = target()->mapFromScene(m_centroid.m_scenePosition);
}
+/*!
+ \readonly
+ \qmlproperty QQuickHandlerPoint QtQuick::MultiPointHandler::centroid
+
+ A point exactly in the middle of the currently-pressed touch points.
+ If only one point is pressed, it's the same as that point.
+ A handler that has a \l target will normally transform it relative to this point.
+*/
+
QT_END_NAMESPACE
diff --git a/src/quick/handlers/qquickpinchhandler.cpp b/src/quick/handlers/qquickpinchhandler.cpp
index 58cd91476d..24f9885534 100644
--- a/src/quick/handlers/qquickpinchhandler.cpp
+++ b/src/quick/handlers/qquickpinchhandler.cpp
@@ -520,7 +520,7 @@ void QQuickPinchHandler::handlePointerEventImpl(QQuickPointerEvent *event)
/*!
\readonly
- \qmlproperty QPointF QtQuick::PinchHandler::centroid
+ \qmlproperty QQuickHandlerPoint QtQuick::PinchHandler::centroid
A point exactly in the middle of the currently-pressed touch points.
If \l pinchOrigin is set to \c PinchCenter, the \l target will be rotated