diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-22 10:49:28 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 10:25:24 +0200 |
| commit | 6e28e8441b698c3397c2c78125c877f2e9867cb1 (patch) | |
| tree | 1e3ad0e43cb775854835817cd04bdc8b5e047e15 /examples/opengl/hellowindow/hellowindow.h | |
| parent | aaa4a26f82f99fa8724841eba91bad029306e0ce (diff) | |
Copy core GL functionality to QtGui with QGL -> QOpenGL naming.
Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855
Reviewed-on: http://codereview.qt.nokia.com/3710
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'examples/opengl/hellowindow/hellowindow.h')
| -rw-r--r-- | examples/opengl/hellowindow/hellowindow.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/opengl/hellowindow/hellowindow.h b/examples/opengl/hellowindow/hellowindow.h index c114b09a24..6ff7411251 100644 --- a/examples/opengl/hellowindow/hellowindow.h +++ b/examples/opengl/hellowindow/hellowindow.h @@ -1,12 +1,12 @@ #include <QWindow> -#include <QtOpenGL/qgl.h> -#include <QtOpenGL/qglshaderprogram.h> -#include <QtOpenGL/qglframebufferobject.h> +#include <QtGui/qopengl.h> +#include <QtGui/qopenglshaderprogram.h> +#include <QColor> #include <QTime> -class QGuiGLContext; +class QOpenGLContext; class Renderer : public QObject { @@ -31,7 +31,6 @@ private: void extrude(qreal x1, qreal y1, qreal x2, qreal y2); QVector<QVector3D> vertices; QVector<QVector3D> normals; - QGLShaderProgram program; int vertexAttr; int normalAttr; int matrixUniform; @@ -39,7 +38,8 @@ private: bool m_initialized; QSurfaceFormat m_format; - QGuiGLContext *m_context; + QOpenGLContext *m_context; + QOpenGLShaderProgram *m_program; }; class HelloWindow : public QWindow |