aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/imports/shapes/qquickshape.cpp2
-rw-r--r--src/quick/handlers/qquickpinchhandler.cpp8
-rw-r--r--src/quick/items/qquickitem.cpp8
-rw-r--r--src/quick/items/qquickwindow.cpp2
4 files changed, 13 insertions, 7 deletions
diff --git a/src/imports/shapes/qquickshape.cpp b/src/imports/shapes/qquickshape.cpp
index 1ed61ff476..6a5c9981e8 100644
--- a/src/imports/shapes/qquickshape.cpp
+++ b/src/imports/shapes/qquickshape.cpp
@@ -574,6 +574,8 @@ void QQuickShapePath::resetFillGradient()
When using Shape, it is important to be aware of potential performance
implications:
+ \list
+
\li When the application is running with the generic, triangulation-based
Shape implementation, the geometry generation happens entirely on the
CPU. This is potentially expensive. Changing the set of path elements,
diff --git a/src/quick/handlers/qquickpinchhandler.cpp b/src/quick/handlers/qquickpinchhandler.cpp
index 465a49a6fd..5a8a382c47 100644
--- a/src/quick/handlers/qquickpinchhandler.cpp
+++ b/src/quick/handlers/qquickpinchhandler.cpp
@@ -131,7 +131,7 @@ void QQuickPinchHandler::setPinchOrigin(QQuickPinchHandler::PinchOrigin pinchOri
}
/*!
- \qmlproperty QQuickPinchHandler::minimumX
+ \qmlproperty real QQuickPinchHandler::minimumX
The minimum acceptable x coordinate of the centroid
*/
@@ -144,7 +144,7 @@ void QQuickPinchHandler::setMinimumX(qreal minX)
}
/*!
- \qmlproperty QQuickPinchHandler::maximumX
+ \qmlproperty real QQuickPinchHandler::maximumX
The maximum acceptable x coordinate of the centroid
*/
@@ -157,7 +157,7 @@ void QQuickPinchHandler::setMaximumX(qreal maxX)
}
/*!
- \qmlproperty QQuickPinchHandler::minimumY
+ \qmlproperty real QQuickPinchHandler::minimumY
The minimum acceptable y coordinate of the centroid
*/
@@ -170,7 +170,7 @@ void QQuickPinchHandler::setMinimumY(qreal minY)
}
/*!
- \qmlproperty QQuickPinchHandler::maximumY
+ \qmlproperty real QQuickPinchHandler::maximumY
The maximum acceptable y coordinate of the centroid
*/
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 9f2d543387..3b30dfacb9 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -7231,6 +7231,8 @@ void QQuickItem::setAcceptHoverEvents(bool enabled)
If this is false, then the item will not receive any touch events through
the touchEvent() function.
+
+ \since 5.10
*/
bool QQuickItem::acceptTouchEvents() const
{
@@ -7242,12 +7244,14 @@ bool QQuickItem::acceptTouchEvents() const
If \a enabled is true, this sets the item to accept touch events;
otherwise, touch events are not accepted by this item.
+ \since 5.10
+
\sa acceptTouchEvents()
*/
-void QQuickItem::setAcceptTouchEvents(bool accept)
+void QQuickItem::setAcceptTouchEvents(bool enabled)
{
Q_D(QQuickItem);
- d->touchEnabled = accept;
+ d->touchEnabled = enabled;
}
void QQuickItemPrivate::setHasCursorInChild(bool hasCursor)
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 44bcda027f..3d355bb5b3 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -4827,7 +4827,7 @@ void QQuickWindow::setSceneGraphBackend(const QString &backend)
}
/*!
- Returns the requested Qt Quick scenegraph \a backend.
+ Returns the requested Qt Quick scenegraph backend.
\note The return value of this function may still be outdated by
subsequent calls to setSceneGraphBackend() until the first QQuickWindow in the