diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2013-04-04 09:37:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-05 00:14:37 +0200 |
| commit | f46787b48a4452cc19ed4201cfc8cac7b7cddcfe (patch) | |
| tree | 2fed0f0b5d49df584862a51738c6feab9bb1b10f /util/glgen/qopenglversionfunctions.h.header | |
| parent | 8d92244d802599871b573c8ce9adcda95c68e578 (diff) | |
| download | qtbase-f46787b48a4452cc19ed4201cfc8cac7b7cddcfe.tar.gz qtbase-f46787b48a4452cc19ed4201cfc8cac7b7cddcfe.tar.bz2 qtbase-f46787b48a4452cc19ed4201cfc8cac7b7cddcfe.zip | |
Bring glgen into line with OpenGL functions and extensions code
This ensures that glgen outputs exactly what is included in
src/gui/opengl/qopenglversionfunctions.*
src/gui/opengl/qopenglfunctions_*
src/openglextensions/*
Change-Id: I7d41d9fc2bf6e5fedf11f58872c079339dac3649
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'util/glgen/qopenglversionfunctions.h.header')
| -rw-r--r-- | util/glgen/qopenglversionfunctions.h.header | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/util/glgen/qopenglversionfunctions.h.header b/util/glgen/qopenglversionfunctions.h.header index 3bd28fc52d..69cdaf3728 100644 --- a/util/glgen/qopenglversionfunctions.h.header +++ b/util/glgen/qopenglversionfunctions.h.header @@ -51,17 +51,18 @@ #ifndef QOPENGLVERSIONFUNCTIONS_H #define QOPENGLVERSIONFUNCTIONS_H +#include <QtCore/qglobal.h> + #ifndef QT_NO_OPENGL -#include <QtCore/QtGlobal> #include <QtCore/qhash.h> #include <QtCore/qpair.h> #include <QtGui/qopengl.h> -class QOpenGLContext; - QT_BEGIN_NAMESPACE +class QOpenGLContext; + #if 0 // silence syncqt warnings #pragma qt_class(QOpenGLVersionFunctions) |