summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2017-06-16 11:36:39 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2017-06-19 14:13:37 +0000
commitee076afedccbe1d37306a7972051f84eb036d655 (patch)
tree46c1427a919fe98a5a219d545273b26ec035a9d9
parentc40b68aa0b0a779297ebe70b9a990eb722407d3f (diff)
Path and PathMove doc fixes
Change-Id: Ife5f290d6860d2e0a41b61da1f7cc2bc995a4079 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-rw-r--r--src/quick/util/qquickpath.cpp22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index 0103f66814..15defdc01b 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -124,7 +124,7 @@ QT_BEGIN_NAMESPACE
\li PathSvg
\li Yes
\li Yes
- \li Yes, with limitations
+ \li Yes
\li Yes
\row
\li PathAttribute
@@ -1124,13 +1124,6 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data)
\ingroup qtquick-animation-paths
\brief Moves the Path's position
- While not relevant with PathView, for Path elements used with Shape it
- is important to distinguish between the operations of drawing a straight
- line and moving the path position without drawing anything.
-
- \note PathMove should not be used in a Path associated with a PathView. Use
- PathLine instead.
-
The example below creates a path consisting of two horizontal lines with
some empty space between them. All three segments have a width of 100:
@@ -1143,6 +1136,11 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data)
}
\endqml
+ \note PathMove should not be used in a Path associated with a PathView. Use
+ PathLine instead. For ShapePath however it is important to distinguish
+ between the operations of drawing a straight line and moving the path
+ position without drawing anything.
+
\sa Path, PathQuad, PathCubic, PathArc, PathCurve, PathSvg, PathLine
*/
@@ -1930,10 +1928,10 @@ void QQuickPathArc::addToPath(QPainterPath &path, const QQuickPathData &data)
\endqml
\endtable
- \note Mixing PathSvg with other type of elements is not always supported,
- therefore it is strongly recommended to avoid this. For example, when
- \l Shape is backed by \c{GL_NV_path_rendering}, a Path can contain one or
- more PathSvg elements, or one or more other type of elements, but not both.
+ \note Mixing PathSvg with other type of elements is not always supported.
+ For example, when \l Shape is backed by \c{GL_NV_path_rendering}, a
+ ShapePath can contain one or more PathSvg elements, or one or more other
+ type of elements, but not both.
\sa Path, PathLine, PathQuad, PathCubic, PathArc, PathCurve
*/