summaryrefslogtreecommitdiffstats
path: root/src/render/geometry
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2020-01-15 19:09:24 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2020-01-15 19:09:24 +0200
commit5aedae5aa9251e1216d7bc1652cb1f451dd047c1 (patch)
tree1e3c00ccac6cb4082d8bd3e52f047f8cbc058b61 /src/render/geometry
parent532e108a3abf56aa0ef709af5049ce3b2161ed84 (diff)
parentdf5a63b059956e8a717db9110327cc86612cc934 (diff)
Merge 5.14 into 5.14.1v5.14.1
Diffstat (limited to 'src/render/geometry')
-rw-r--r--src/render/geometry/qgeometryrenderer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp
index 64f3e058e..8720a5c00 100644
--- a/src/render/geometry/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
@@ -149,7 +149,7 @@ QGeometryRendererPrivate::~QGeometryRendererPrivate()
*/
/*!
- \qmlproperty int GeometryRenderer::restartIndex
+ \qmlproperty int GeometryRenderer::restartIndexValue
Holds the restart index.
*/
@@ -161,7 +161,7 @@ QGeometryRendererPrivate::~QGeometryRendererPrivate()
*/
/*!
- \qmlproperty bool GeometryRenderer::primitiveRestart
+ \qmlproperty bool GeometryRenderer::primitiveRestartEnabled
Holds the primitive restart flag.
*/