Merge branch 'refactor'

Conflicts:
	src/declarative/items/context2d/qsgcanvasitem.cpp
	src/declarative/items/context2d/qsgcontext2d.cpp
	src/declarative/items/context2d/qsgcontext2d_p_p.h
	src/declarative/particles/qsgcustomparticle.cpp
	src/declarative/particles/qsgparticlesystem.cpp

Change-Id: I24e81d3652368c5031305ffa7f969f9f2c249c6c

1 files changed, 4 insertions, 4 deletions

diff --git a/src/declarative/scenegraph/coreapi/qsgmaterial.h b/src/declarative/scenegraph/coreapi/qsgmaterial.h
index 7c6935899e..084219bfba 100644
--- a/src/declarative/scenegraph/coreapi/qsgmaterial.h
+++ b/src/declarative/scenegraph/coreapi/qsgmaterial.h
@@ -42,7 +42,7 @@
 #ifndef MATERIAL_H
 #define MATERIAL_H
 
-#include <qglshaderprogram.h>
+#include <qopenglshaderprogram.h>
 
 QT_BEGIN_HEADER
 
@@ -75,7 +75,7 @@ public:
         QRect viewportRect() const;
         QRect deviceRect() const;
 
-        const QGLContext *context() const;
+        QOpenGLContext *context() const;
 
     private:
         friend class QSGRenderer;
@@ -91,7 +91,7 @@ public:
     virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial);
     virtual char const *const *attributeNames() const = 0; // Array must end with null.
 
-    inline QGLShaderProgram *program() { return &m_program; }
+    inline QOpenGLShaderProgram *program() { return &m_program; }
 
 protected:
 
@@ -104,7 +104,7 @@ protected:
     virtual const char *fragmentShader() const = 0;
 
 private:
-    QGLShaderProgram m_program;
+    QOpenGLShaderProgram m_program;
     void *m_reserved;
 };