diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-10 13:01:05 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-10 13:01:05 +0300 |
| commit | 293252db84f9ad3b6f6bdb4d467aee88d4ee7f94 (patch) | |
| tree | 3fa3ea8fb304b04abfadd3276992b4945b5504c6 /src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc | |
| parent | a6e2ddcec415577d535d02dbac172a2499f8288a (diff) | |
| parent | 8a372da705c71c1295a570564c0c7ef4c9698e42 (diff) | |
Merge remote-tracking branch 'origin/develop'
Change-Id: I79e22eacd17dd2108d54c5f623c48117245f9424
Diffstat (limited to 'src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc')
| -rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc index ba3173b0..2cc3eece 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc @@ -53,7 +53,7 @@ /*! \qmlproperty Scene3D AbstractGraph3D::scene - Read only Q3DScene that can be used to access e.g. camera object. + Read only property that can be used to access for example Camera3D via the Scene3D held here. */ /*! @@ -146,6 +146,13 @@ */ /*! + * \qmlproperty list<Custom3DItem> AbstractGraph3D::customItemList + * \since QtDataVisualization 1.1 + * + * Add a list of \l{Custom3DItem}s to the graph. Graph takes ownership of the added items. + */ + +/*! * \qmlmethod void AbstractGraph3D::clearSelection() * Clears selection from all attached series. */ |