diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
| commit | e3a4f132ca2a42af3d4bb889d6a17948b88d26a2 (patch) | |
| tree | 554d2b8b3020dc71438301aa696dea1e9a36943a /src/datavisualization/theme/q3dtheme.cpp | |
| parent | cc50608385cf77a0803431ece1385f341a400b75 (diff) | |
| parent | bf716cfdf0afecccdb1f2eabb2e6a172c620fbff (diff) | |
Merge branch 'develop'
Conflicts:
.qmake.conf
README
src/datavisualization/global/qdatavisualizationglobal.h
Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11
Diffstat (limited to 'src/datavisualization/theme/q3dtheme.cpp')
| -rw-r--r-- | src/datavisualization/theme/q3dtheme.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/theme/q3dtheme.cpp b/src/datavisualization/theme/q3dtheme.cpp index 97ff8f81..a1dfe8b3 100644 --- a/src/datavisualization/theme/q3dtheme.cpp +++ b/src/datavisualization/theme/q3dtheme.cpp @@ -323,7 +323,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! * \qmlproperty real Theme3D::lightStrength * - * Specular light strength for the whole graph. Value must be between 0.0 and 1.0. + * Specular light strength for the whole graph. Value must be between 0.0 and 10.0. */ /*! @@ -335,7 +335,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! * \qmlproperty real Theme3D::highlightLightStrength * - * Specular light strength for highlighted objects. Value must be between 0.0 and 1.0. + * Specular light strength for highlighted objects. Value must be between 0.0 and 10.0. */ /*! @@ -679,7 +679,7 @@ QLinearGradient Q3DTheme::multiHighlightGradient() const /*! * \property Q3DTheme::lightStrength * - * Specular light strength for the whole graph. Value must be 0.0f and 10.0f. + * Specular light strength for the whole graph. Value must be between 0.0f and 10.0f. */ void Q3DTheme::setLightStrength(float strength) { |