diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:12:27 +0200 |
| commit | e7b022ec334ce6768c30402c1e17fe0a1e3a0bb0 (patch) | |
| tree | 72641f2dc53522ca1959ac8c1d06692303c3a17b /src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc | |
| parent | 5adf257bebf2df7f54b92fb724cd547dc58a1163 (diff) | |
| parent | 73ec35fa12a4b150670ea93d3021ca8e658063e1 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ibb41c2bb83df7e02696e27afe62e94ed059284ae
Diffstat (limited to 'src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc')
| -rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc index 0aca2af4..8c465216 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc @@ -52,34 +52,34 @@ /*! \qmlproperty ValueAxis3D Surface3D::axisX - The active X axis. + The active x-axis. - If an axis is not given, a temporary default axis with no labels and automatically adjusting - range is created. + If an axis is not given, a temporary default axis with no labels and an + automatically adjusting range is created. This temporary axis is destroyed if another axis is explicitly set to the same orientation. */ /*! \qmlproperty ValueAxis3D Surface3D::axisY - The active Y axis. + The active y-axis. - If an axis is not given, a temporary default axis with no labels and automatically adjusting - range is created. + If an axis is not given, a temporary default axis with no labels and an + automatically adjusting range is created. This temporary axis is destroyed if another axis is explicitly set to the same orientation. */ /*! \qmlproperty ValueAxis3D Surface3D::axisZ - The active Z axis. + The active z-axis. - If an axis is not given, a temporary default axis with no labels and automatically adjusting - range is created. + If an axis is not given, a temporary default axis with no labels and an + automatically adjusting range is created. This temporary axis is destroyed if another axis is explicitly set to the same orientation. */ /*! * \qmlproperty Surface3DSeries Surface3D::selectedSeries - * The selected series or \c null. If \l {QAbstract3DGraph::selectionMode}{selectionMode} has + * The selected series or null. If \l {QAbstract3DGraph::selectionMode}{selectionMode} has the * \c SelectionMultiSeries flag set, this property holds the series which owns the selected point. */ @@ -114,5 +114,5 @@ /*! * \qmlmethod void Surface3D::removeSeries(Surface3DSeries series) - * Remove the \a series from the graph. + * Removes the \a series from the graph. */ |