summaryrefslogtreecommitdiffstats
path: root/examples/opengl/cube/mainwidget.h
diff options
context:
space:
mode:
Diffstat (limited to 'examples/opengl/cube/mainwidget.h')
-rw-r--r--examples/opengl/cube/mainwidget.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/opengl/cube/mainwidget.h b/examples/opengl/cube/mainwidget.h
index 92b3aabf46..8aff8f7714 100644
--- a/examples/opengl/cube/mainwidget.h
+++ b/examples/opengl/cube/mainwidget.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtCore module of the Qt Toolkit.
@@ -43,18 +43,18 @@
#include "geometryengine.h"
-#include <QGLWidget>
-#include <QGLFunctions>
+#include <QOpenGLWidget>
+#include <QOpenGLFunctions>
#include <QMatrix4x4>
#include <QQuaternion>
#include <QVector2D>
#include <QBasicTimer>
-#include <QGLShaderProgram>
-
+#include <QOpenGLShaderProgram>
+#include <QOpenGLTexture>
class GeometryEngine;
-class MainWidget : public QGLWidget, protected QGLFunctions
+class MainWidget : public QOpenGLWidget, protected QOpenGLFunctions
{
Q_OBJECT
@@ -76,10 +76,10 @@ protected:
private:
QBasicTimer timer;
- QGLShaderProgram program;
- GeometryEngine geometries;
+ QOpenGLShaderProgram program;
+ GeometryEngine *geometries;
- GLuint texture;
+ QOpenGLTexture *texture;
QMatrix4x4 projection;