diff options
| author | Martin Smith <martin.smith@qt.io> | 2016-11-29 12:20:47 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2016-12-03 19:17:53 +0000 |
| commit | f27a1ae9a837a9375319d3705fd615556be59d66 (patch) | |
| tree | 7fb0c5860a38d8af4d9e341f8065af482538e11a | |
| parent | 5497e6de89fa85f6367a558419d35af117a16a38 (diff) | |
doc: Always declare GL types for clangqdoc
GLint, GLuint, GLfloat, and GLenum must be declared for
clangqdoc because it must generate the documentation for
opengl support whether or not opengl support is provided.
Change-Id: I1dccac86fe72a30509bc563dda0b60bcb156bc0b
Reviewed-by: Martin Smith <martin.smith@qt.io>
| -rw-r--r-- | src/gui/opengl/qopengldebug.h | 5 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglshaderprogram.h | 7 | ||||
| -rw-r--r-- | src/opengl/qgl.h | 9 |
3 files changed, 21 insertions, 0 deletions
diff --git a/src/gui/opengl/qopengldebug.h b/src/gui/opengl/qopengldebug.h index 74b2731f7e..6b10c36291 100644 --- a/src/gui/opengl/qopengldebug.h +++ b/src/gui/opengl/qopengldebug.h @@ -52,6 +52,11 @@ #include <QtCore/qdebug.h> #include <QtGui/qopenglcontext.h> +#if defined(Q_CLANG_QDOC) +#undef GLuint +typedef unsigned int GLuint; +#endif + QT_BEGIN_NAMESPACE class QOpenGLDebugLogger; diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h index cf67e59c8f..fd4d82ecf9 100644 --- a/src/gui/opengl/qopenglshaderprogram.h +++ b/src/gui/opengl/qopenglshaderprogram.h @@ -50,6 +50,13 @@ #include <QtGui/qvector4d.h> #include <QtGui/qmatrix4x4.h> +#if defined(Q_CLANG_QDOC) +#undef GLint +typedef int GLint; +#undef GLfloat +typedef double GLfloat; +#endif + QT_BEGIN_NAMESPACE diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index a97ddb2b27..ab418c191a 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -51,6 +51,15 @@ #include <QtGui/QSurfaceFormat> +#if defined(Q_CLANG_QDOC) +#undef GLint +typedef int GLint; +#undef GLuint +typedef unsigned int GLuint; +#undef GLenum +typedef unsigned int GLenum; +#endif + QT_BEGIN_NAMESPACE |