diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-25 13:40:12 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 10:25:51 +0200 |
| commit | 957c8fb9946643a779e0a84eeeca2f150f221cba (patch) | |
| tree | f3cd7b62c4943f1c62c6da0ff802b296ac66c88d /src/declarative/items/qsgcanvas.h | |
| parent | f37b38e4cd4aa9e0443640a1fd73c239cab0d45e (diff) | |
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>
Diffstat (limited to 'src/declarative/items/qsgcanvas.h')
| -rw-r--r-- | src/declarative/items/qsgcanvas.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/items/qsgcanvas.h b/src/declarative/items/qsgcanvas.h index be6b173de9..e364ee88f5 100644 --- a/src/declarative/items/qsgcanvas.h +++ b/src/declarative/items/qsgcanvas.h @@ -43,7 +43,7 @@ #define QSGCANVAS_H #include <QtCore/qmetatype.h> -#include <QtOpenGL/qgl.h> +#include <QtGui/qopengl.h> #include <QtWidgets/qwidget.h> QT_BEGIN_HEADER @@ -55,7 +55,7 @@ QT_MODULE(Declarative) class QSGItem; class QSGEngine; class QSGCanvasPrivate; -class QGLFramebufferObject; +class QOpenGLFramebufferObject; class Q_DECLARATIVE_EXPORT QSGCanvas : public QWindow { @@ -82,8 +82,8 @@ public: QImage grabFrameBuffer(); - void setRenderTarget(QGLFramebufferObject *fbo); - QGLFramebufferObject *renderTarget() const; + void setRenderTarget(QOpenGLFramebufferObject *fbo); + QOpenGLFramebufferObject *renderTarget() const; signals: void frameSwapped(); |