Merge branch 'develop' into mergebranch

Conflicts:
	examples/qmlbars/qml/qmlbars/main.qml
	examples/qmlscatter/qml/qmlscatter/main.qml
	examples/qmlsurface/qml/qmlsurface/main.qml
	src/datavisualization/data/qitemmodelbardatamapping.cpp
	src/datavisualization/data/qitemmodelscatterdatamapping.cpp
	src/datavisualization/data/qitemmodelsurfacedatamapping.cpp
	src/datavisualization/engine/drawer.cpp

Change-Id: I731ebdb2cc5cee8f2cb32becee96d1fc1b3e5de1

1 files changed, 4 insertions, 0 deletions

diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h
index 73e5b9ee..191b7bf6 100644
--- a/src/datavisualization/utils/shaderhelper_p.h
+++ b/src/datavisualization/utils/shaderhelper_p.h
@@ -71,6 +71,8 @@ class ShaderHelper
     GLuint color();
     GLuint texture();
     GLuint shadow();
+    GLuint gradientMin();
+    GLuint gradientHeight();
 
     GLuint posAtt();
     GLuint uvAtt();
@@ -102,6 +104,8 @@ class ShaderHelper
     GLuint m_shadowQualityUniform;
     GLuint m_textureUniform;
     GLuint m_shadowUniform;
+    GLuint m_gradientMinUniform;
+    GLuint m_gradientHeightUniform;
 
     GLboolean m_initialized;
 };