From 25bbcf9605f65548d7f581304b7d8ad300aa9937 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Mon, 4 Jul 2011 16:44:29 +0200
Subject: Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from
 qt5/qtbase.

---
 examples/opengl/cube/geometryengine.cpp | 2 ++
 examples/opengl/cube/mainwidget.cpp     | 2 ++
 examples/opengl/cube/mainwidget.h       | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

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:
-- 
cgit v0.12