Merge branch 'develop'

Change-Id: I2f27b074a095cd449a92778be4681f5e56590e17

1 files changed, 2 insertions, 2 deletions

diff --git a/src/datavisualizationqml2/glstatestore.cpp b/src/datavisualizationqml2/glstatestore.cpp
index 973d5054..5775694d 100644
--- a/src/datavisualizationqml2/glstatestore.cpp
+++ b/src/datavisualizationqml2/glstatestore.cpp
@@ -57,7 +57,7 @@ GLStateStore::GLStateStore(QOpenGLContext *context, QObject *parent) :
     m_vertexAttribArrayTypes.reset(new GLint[maxVertexAttribs]);
     m_vertexAttribArrayNormalized.reset(new GLint[maxVertexAttribs]);
     m_vertexAttribArrayStrides.reset(new GLint[maxVertexAttribs]);
-    m_vertexAttribArrayOffsets.reset(new GLint[maxVertexAttribs]);
+    m_vertexAttribArrayOffsets.reset(new void *[maxVertexAttribs]);
 
     initGLDefaultState();
 }
@@ -336,7 +336,7 @@ void GLStateStore::restoreGLState()
                               m_vertexAttribArrayTypes[i],
                               m_vertexAttribArrayNormalized[i],
                               m_vertexAttribArrayStrides[i],
-                              (void *) m_vertexAttribArrayOffsets[i]);
+                              m_vertexAttribArrayOffsets[i]);
     }
 
     glBindBuffer(GL_ARRAY_BUFFER, m_boundArrayBuffer);