diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:10:44 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:13:58 +0200 |
| commit | b368e57e59351736f9ad06834a743a7c1b49d368 (patch) | |
| tree | 3b7d42569905d8cde0ca7571cd664428354a50dd /src/datavisualizationqml2/declarativeseries.cpp | |
| parent | eb3d0514ca886db33776522ea00f27b69bc86ad1 (diff) | |
| parent | 05d06fbc61f07e400b519a9b020c2473398627c1 (diff) | |
Merge branch 'develop'v1.0.0-beta1
Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4
Diffstat (limited to 'src/datavisualizationqml2/declarativeseries.cpp')
| -rw-r--r-- | src/datavisualizationqml2/declarativeseries.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml2/declarativeseries.cpp index 35f6e315..1a762152 100644 --- a/src/datavisualizationqml2/declarativeseries.cpp +++ b/src/datavisualizationqml2/declarativeseries.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -22,7 +22,7 @@ #include "qsurfacedataproxy.h" #include <QMetaMethod> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION static void setSeriesGradient(QAbstract3DSeries *series, const ColorGradient &gradient, GradientType type) { @@ -235,6 +235,11 @@ ColorGradient *DeclarativeScatter3DSeries::multiHighlightGradient() const return m_multiHighlightGradient; } +int DeclarativeScatter3DSeries::invalidSelectionIndex() const +{ + return QScatter3DSeries::invalidSelectionIndex(); +} + void DeclarativeScatter3DSeries::handleBaseGradientUpdate() { if (m_baseGradient) @@ -343,4 +348,4 @@ void DeclarativeSurface3DSeries::handleMultiHighlightGradientUpdate() setSeriesGradient(this, *m_multiHighlightGradient, GradientTypeMulti); } -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION |