diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:00:24 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:03:16 +0300 |
| commit | cfbfbea7d932f98c3f541bb4fc3e975ffb7a5658 (patch) | |
| tree | bed376368e9611c751cf1dd75b85de2827d67325 /src/datavisualizationqml2/declarativeseries.cpp | |
| parent | 8435c15d224a4e9db0920ecd33c4bea3e70d83bf (diff) | |
| parent | c51e0f83ef6dd9e85db6953995585ba0cafb35d7 (diff) | |
Merge branch 'develop'
Change-Id: I3d06158cec5e54f69ff3d0606b7d1dfe1a8a2f70
Diffstat (limited to 'src/datavisualizationqml2/declarativeseries.cpp')
| -rw-r--r-- | src/datavisualizationqml2/declarativeseries.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml2/declarativeseries.cpp index 21555f45..661f87ba 100644 --- a/src/datavisualizationqml2/declarativeseries.cpp +++ b/src/datavisualizationqml2/declarativeseries.cpp @@ -17,14 +17,12 @@ ****************************************************************************/ #include "declarativeseries_p.h" -#include "qbardataproxy.h" -#include "qscatterdataproxy.h" -#include "qsurfacedataproxy.h" #include <QtCore/QMetaMethod> QT_BEGIN_NAMESPACE_DATAVISUALIZATION -static void setSeriesGradient(QAbstract3DSeries *series, const ColorGradient &gradient, GradientType type) +static void setSeriesGradient(QAbstract3DSeries *series, const ColorGradient &gradient, + GradientType type) { QLinearGradient newGradient; QGradientStops stops; @@ -198,7 +196,8 @@ QQmlListProperty<QObject> DeclarativeScatter3DSeries::seriesChildren() , 0, 0, 0); } -void DeclarativeScatter3DSeries::appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element) +void DeclarativeScatter3DSeries::appendSeriesChildren(QQmlListProperty<QObject> *list, + QObject *element) { QScatterDataProxy *proxy = qobject_cast<QScatterDataProxy *>(element); if (proxy) @@ -293,7 +292,8 @@ QQmlListProperty<QObject> DeclarativeSurface3DSeries::seriesChildren() , 0, 0, 0); } -void DeclarativeSurface3DSeries::appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element) +void DeclarativeSurface3DSeries::appendSeriesChildren(QQmlListProperty<QObject> *list, + QObject *element) { QSurfaceDataProxy *proxy = qobject_cast<QSurfaceDataProxy *>(element); if (proxy) |