diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-04 17:59:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-04 17:59:08 (GMT) |
| commit | 5016de08d84c4d2887f7424dbf17f31e27c2e8e2 (patch) | |
| tree | bf4206266ef3f6114b78db08214782705daa5c56 /examples | |
| parent | 1eca095c5c426a9d79c2fb651f0f3ee27164fca0 (diff) | |
| parent | 8b89d0aa973c52b44112f10c9fbd9701b17bb333 (diff) | |
| download | Qt-5016de08d84c4d2887f7424dbf17f31e27c2e8e2.zip Qt-5016de08d84c4d2887f7424dbf17f31e27c2e8e2.tar.gz Qt-5016de08d84c4d2887f7424dbf17f31e27c2e8e2.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from qt5/qtbase.
Committing the qt-webpages.qdoc file with the online links
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/opengl/cube/geometryengine.cpp | 2 | ||||
| -rw-r--r-- | examples/opengl/cube/mainwidget.cpp | 2 | ||||
| -rw-r--r-- | examples/opengl/cube/mainwidget.h | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/examples/opengl/cube/geometryengine.cpp b/examples/opengl/cube/geometryengine.cpp index 3001ed5..c05dde5 100644 --- a/examples/opengl/cube/geometryengine.cpp +++ b/examples/opengl/cube/geometryengine.cpp @@ -61,6 +61,8 @@ GeometryEngine::~GeometryEngine() void GeometryEngine::init() { + initializeGLFunctions(); + //! [0] // Generate 2 VBOs glGenBuffers(2, vboIds); diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp index 2a2cd63..1116526 100644 --- a/examples/opengl/cube/mainwidget.cpp +++ b/examples/opengl/cube/mainwidget.cpp @@ -118,6 +118,8 @@ void MainWidget::timerEvent(QTimerEvent *e) void MainWidget::initializeGL() { + initializeGLFunctions(); + qglClearColor(Qt::black); qDebug() << "Initializing shaders..."; diff --git a/examples/opengl/cube/mainwidget.h b/examples/opengl/cube/mainwidget.h index 33ab0d8..c6da29f 100644 --- a/examples/opengl/cube/mainwidget.h +++ b/examples/opengl/cube/mainwidget.h @@ -42,6 +42,7 @@ #define MAINWIDGET_H #include <QtOpenGL/QGLWidget> +#include <QtOpenGL/QGLFunctions> #include <QMatrix4x4> #include <QQuaternion> @@ -52,7 +53,7 @@ class QGLShaderProgram; class GeometryEngine; -class MainWidget : public QGLWidget +class MainWidget : public QGLWidget, protected QGLFunctions { Q_OBJECT public: |