Get declarative running on new gui/opengl stack.

Rename QGuiGLContext -> QOpenGLContext, QGL* -> QOpenGL*, etc.

Change-Id: I08379029d756e28b20ae141ca30ed801626b513d
Reviewed-on: http://codereview.qt.nokia.com/3711
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/declarative/scenegraph/qsgcontext_p.h b/src/declarative/scenegraph/qsgcontext_p.h
index 29a5aac4b9..a05854ebe8 100644
--- a/src/declarative/scenegraph/qsgcontext_p.h
+++ b/src/declarative/scenegraph/qsgcontext_p.h
@@ -42,6 +42,7 @@
 #ifndef QSGCONTEXT_H
 #define QSGCONTEXT_H
 
+#include <QImage>
 #include <QObject>
 #include <qabstractanimation.h>
 
@@ -64,8 +65,8 @@ class QSGMaterial;
 class QSGMaterialShader;
 class QSGEngine;
 
-class QGLContext;
-class QGLFramebufferObject;
+class QOpenGLContext;
+class QOpenGLFramebufferObject;
 
 class Q_DECLARATIVE_EXPORT QSGContext : public QObject
 {
@@ -76,7 +77,7 @@ public:
     explicit QSGContext(QObject *parent = 0);
     ~QSGContext();
 
-    virtual void initialize(QGLContext *context);
+    virtual void initialize(QOpenGLContext *context);
 
     QSGRenderer *renderer() const;
 
@@ -84,13 +85,13 @@ public:
     QSGRootNode *rootNode() const;
 
     QSGEngine *engine() const;
-    QGLContext *glContext() const;
+    QOpenGLContext *glContext() const;
 
     bool isReady() const;
 
     QSGMaterialShader *prepareMaterial(QSGMaterial *material);
 
-    virtual void renderNextFrame(QGLFramebufferObject *fbo = 0);
+    virtual void renderNextFrame(QOpenGLFramebufferObject *fbo = 0);
 
     virtual QSGRectangleNode *createRectangleNode();
     virtual QSGImageNode *createImageNode();