diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
| commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
| tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /examples/opengl/cube/geometryengine.h | |
| parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
| parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) | |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'examples/opengl/cube/geometryengine.h')
| -rw-r--r-- | examples/opengl/cube/geometryengine.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/examples/opengl/cube/geometryengine.h b/examples/opengl/cube/geometryengine.h index 2716b05c2b..6a15c3ce03 100644 --- a/examples/opengl/cube/geometryengine.h +++ b/examples/opengl/cube/geometryengine.h @@ -41,8 +41,8 @@ #ifndef GEOMETRYENGINE_H #define GEOMETRYENGINE_H -#include <QtOpenGL/QGLFunctions> -#include <QtOpenGL/QGLShaderProgram> +#include <QGLFunctions> +#include <QGLShaderProgram> class GeometryEngine : protected QGLFunctions { @@ -51,14 +51,12 @@ public: virtual ~GeometryEngine(); void init(); - void drawCubeGeometry(QGLShaderProgram *program); private: void initCubeGeometry(); - GLuint *vboIds; - + GLuint vboIds[2]; }; #endif // GEOMETRYENGINE_H |