Merge branch 'develop'

Conflicts:
	.qmake.conf
	README
	src/datavisualization/global/qdatavisualizationglobal.h

Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11

1 files changed, 10 insertions, 3 deletions

diff --git a/src/datavisualization/utils/scatterpointbufferhelper_p.h b/src/datavisualization/utils/scatterpointbufferhelper_p.h
index b3adcfa8..8b34542d 100644
--- a/src/datavisualization/utils/scatterpointbufferhelper_p.h
+++ b/src/datavisualization/utils/scatterpointbufferhelper_p.h
@@ -39,21 +39,28 @@ class ScatterPointBufferHelper : public AbstractObjectHelper
 {
 public:
     ScatterPointBufferHelper();
-    ~ScatterPointBufferHelper();
+    virtual ~ScatterPointBufferHelper();
 
     GLuint pointBuf();
 
     void pushPoint(uint pointIndex);
     void popPoint();
     void load(ScatterSeriesRenderCache *cache);
+    void update(ScatterSeriesRenderCache *cache);
+    void setScaleY(float scale) { m_scaleY = scale; }
+    void updateUVs(ScatterSeriesRenderCache *cache);
 
 public:
     GLuint m_pointbuffer;
 
 private:
+    void createRangeGradientUVs(ScatterSeriesRenderCache *cache,
+                                QVector<QVector2D> &buffered_uvs);
+
+private:
     QVector<QVector3D> m_bufferedPoints;
-    uint m_oldRemoveIndex;
-    bool m_oldRemove;
+    int m_oldRemoveIndex;
+    float m_scaleY;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION