diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-20 09:43:57 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-20 09:49:03 +0200 |
| commit | 51deca1429e1097be3108a5dc28a4897944fed1a (patch) | |
| tree | 2c6f5240c2a01d6e793aa03249c17d0cbaa9b455 /src/datavisualization/theme | |
| parent | 631b1913f4115fc163a21fc8aba85b87b10a666a (diff) | |
References to alpha and TP removed
+ implemented the rest of lightColor
Task-number: QTRD-2405
Change-Id: I38402b45cc4a567a79d07b23983567551d06b4fe
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/theme')
| -rw-r--r-- | src/datavisualization/theme/q3dtheme.cpp | 7 | ||||
| -rw-r--r-- | src/datavisualization/theme/q3dtheme.h | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/datavisualization/theme/q3dtheme.cpp b/src/datavisualization/theme/q3dtheme.cpp index 1d331efc..34c86108 100644 --- a/src/datavisualization/theme/q3dtheme.cpp +++ b/src/datavisualization/theme/q3dtheme.cpp @@ -111,8 +111,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \li Qt::white * \row * \li lightColor - * \li The color of the specular light. Doesn't affect ambient light. \note Not yet supported - * in alpha release. + * \li The color of the light. Affects both ambient and specular light. * \li Qt::white * \row * \li lightStrength @@ -295,8 +294,6 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \qmlproperty Color Theme3D::lightColor * * Color for the specular light defined in Scene3D. - * - * \warning Not supported in alpha release. */ /*! @@ -596,8 +593,6 @@ QColor Q3DTheme::multiHighlightColor() const * \property Q3DTheme::lightColor * * Color for the specular light defined in Q3DScene. - * - * \warning Not supported in alpha release. */ void Q3DTheme::setLightColor(const QColor &color) { diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h index 9baec05d..e023c76e 100644 --- a/src/datavisualization/theme/q3dtheme.h +++ b/src/datavisualization/theme/q3dtheme.h @@ -43,7 +43,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DTheme : public QObject Q_PROPERTY(QColor gridLineColor READ gridLineColor WRITE setGridLineColor NOTIFY gridLineColorChanged) Q_PROPERTY(QColor singleHighlightColor READ singleHighlightColor WRITE setSingleHighlightColor NOTIFY singleHighlightColorChanged) Q_PROPERTY(QColor multiHighlightColor READ multiHighlightColor WRITE setMultiHighlightColor NOTIFY multiHighlightColorChanged) - Q_PROPERTY(QColor lightColor READ lightColor WRITE setLightColor NOTIFY lightColorChanged) // TODO: Not used yet + Q_PROPERTY(QColor lightColor READ lightColor WRITE setLightColor NOTIFY lightColorChanged) Q_PROPERTY(QList<QLinearGradient> baseGradients READ baseGradients WRITE setBaseGradients NOTIFY baseGradientsChanged) Q_PROPERTY(QLinearGradient singleHighlightGradient READ singleHighlightGradient WRITE setSingleHighlightGradient NOTIFY singleHighlightGradientChanged) Q_PROPERTY(QLinearGradient multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged) @@ -56,7 +56,6 @@ class QT_DATAVISUALIZATION_EXPORT Q3DTheme : public QObject Q_PROPERTY(bool gridEnabled READ isGridEnabled WRITE setGridEnabled NOTIFY gridEnabledChanged) Q_PROPERTY(bool labelBackgroundEnabled READ isLabelBackgroundEnabled WRITE setLabelBackgroundEnabled NOTIFY labelBackgroundEnabledChanged) Q_PROPERTY(ColorStyle colorStyle READ colorStyle WRITE setColorStyle NOTIFY colorStyleChanged) - // TODO: Add everything we need (specularIntensity, lightDegradation, shaders?) public: enum ColorStyle { |