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/engine/q3dlight.cpp | |
| 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/engine/q3dlight.cpp')
| -rw-r--r-- | src/datavisualization/engine/q3dlight.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualization/engine/q3dlight.cpp b/src/datavisualization/engine/q3dlight.cpp index 8c439023..bce35d99 100644 --- a/src/datavisualization/engine/q3dlight.cpp +++ b/src/datavisualization/engine/q3dlight.cpp @@ -58,10 +58,10 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! * \qmlproperty bool Light3D::autoPosition * \since QtDataVisualization 1.3 - * Holds a flag telling if the light position is automatic or not. If true, light position follows - * camera automatically. + * Defines whether the light position follows the camera automatically. * \note Has no effect if shadows are enabled. Remember to disable shadows before setting light's - * position, or it will be overwritten by automatic positioning, if autoPosition is false. + * position, or it will be overwritten by automatic positioning if this + * property is \c false. */ /*! @@ -84,10 +84,10 @@ Q3DLight::~Q3DLight() /*! * \property Q3DLight::autoPosition * \since QtDataVisualization 5.9 - * Holds a flag telling if the light position is automatic or not. If true, light position follows - * camera automatically. + * \brief Whether the light position follows the camera automatically. * \note Has no effect if shadows are enabled. Remember to disable shadows before setting light's - * position, or it will be overwritten by automatic positioning, if isAutoPosition() is false. + * position, or it will be overwritten by automatic positioning if + * \c isAutoPosition() is \c false. */ void Q3DLight::setAutoPosition(bool enabled) { |