diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-08 22:54:48 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-08 22:54:48 (GMT) |
| commit | 1b08e9bf28ba4f2c49b9240abc59f805802bdc1d (patch) | |
| tree | b2c865a6feec197a0034a7b82a2cd43e2a025ff6 /examples/opengl/textures/glwidget.h | |
| parent | d29c604b0365dfbc20f8aea8d2cb63f621995219 (diff) | |
| parent | f52dc5bf1e885c9a4d226c2484249e7d9faf0a99 (diff) | |
| download | Qt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.zip Qt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.tar.gz Qt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'examples/opengl/textures/glwidget.h')
| -rw-r--r-- | examples/opengl/textures/glwidget.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/opengl/textures/glwidget.h b/examples/opengl/textures/glwidget.h index 68be8bc..f793d6d 100644 --- a/examples/opengl/textures/glwidget.h +++ b/examples/opengl/textures/glwidget.h @@ -44,6 +44,8 @@ #include <QGLWidget> +class CubeObject; + class GLWidget : public QGLWidget { Q_OBJECT @@ -69,16 +71,14 @@ protected: void mouseReleaseEvent(QMouseEvent *event); private: - GLuint makeObject(); + void makeObject(); QColor clearColor; QPoint lastPos; int xRot; int yRot; int zRot; - - static GLuint sharedObject; - static int refCount; + CubeObject *cube; }; #endif |