diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/opengl/qopenglfunctions.cpp | 6 | ||||
-rw-r--r-- | src/gui/opengl/qopenglfunctions.h | 23 |
2 files changed, 26 insertions, 3 deletions
diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index 739ecacc51..23342f7935 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -2584,7 +2584,7 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS) */ /*! - \fn void QOpenGLExtraFunctions::glEndTransformFeedback(void) + \fn void QOpenGLExtraFunctions::glEndTransformFeedback() Convenience function that calls glEndTransformFeedback(). @@ -3091,7 +3091,7 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS) */ /*! - \fn void QOpenGLExtraFunctions::glPauseTransformFeedback(void) + \fn void QOpenGLExtraFunctions::glPauseTransformFeedback() Convenience function that calls glPauseTransformFeedback(). @@ -3156,7 +3156,7 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS) */ /*! - \fn void QOpenGLExtraFunctions::glResumeTransformFeedback(void) + \fn void QOpenGLExtraFunctions::glResumeTransformFeedback() Convenience function that calls glResumeTransformFeedback(). diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 273ceaddc0..72af128219 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -227,6 +227,29 @@ struct QOpenGLFunctionsPrivate; #undef glTexLevelParameteriv +#if defined(Q_CLANG_QDOC) +#undef GLint +typedef int GLint; +#undef GLsizei +typedef int GLsizei; +#undef GLuint +typedef unsigned int GLuint; +#undef GLenum +typedef unsigned int GLenum; +#undef GLbitfield +typedef unsigned int GLbitfield; +#undef GLfloat +typedef float GLfloat; +#undef GLclampf +typedef float GLclampf; +#undef GLboolean +typedef bool GLboolean; +#undef GLvoid +typedef void GLvoid; +#undef GLchar +typedef char GLchar; +#endif + class Q_GUI_EXPORT QOpenGLFunctions { public: |