diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/opengl/qopenglframebufferobject.cpp | 13 | ||||
-rw-r--r-- | src/gui/opengl/qopenglframebufferobject.h | 12 | ||||
-rw-r--r-- | src/opengl/qglshaderprogram.h | 11 |
3 files changed, 28 insertions, 8 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index 628475a90a..469f019a1c 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -816,7 +816,7 @@ static inline GLenum effectiveInternalFormat(GLenum internalFormat) return internalFormat; } -/*! \fn QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, GLenum target) +/*! Constructs an OpenGL framebuffer object and binds a 2D OpenGL texture to the buffer of the size \a size. The texture is bound to the @@ -847,7 +847,7 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, GLenum tar d->init(this, size, NoAttachment, target, effectiveInternalFormat(0)); } -/*! \overload +/*! Constructs an OpenGL framebuffer object and binds a 2D OpenGL texture to the buffer of the given \a width and \a height. @@ -859,7 +859,7 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, GLenum { } -/*! \overload +/*! Constructs an OpenGL framebuffer object of the given \a size based on the supplied \a format. @@ -873,7 +873,7 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, const QOpe format.samples(), format.mipmap()); } -/*! \overload +/*! Constructs an OpenGL framebuffer object of the given \a width and \a height based on the supplied \a format. @@ -884,7 +884,7 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, const { } -/*! \overload +/*! Constructs an OpenGL framebuffer object and binds a texture to the buffer of the given \a width and \a height. @@ -905,7 +905,7 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, Attach d->init(this, QSize(width, height), attachment, target, effectiveInternalFormat(internalFormat)); } -/*! \overload +/*! Constructs an OpenGL framebuffer object and binds a texture to the buffer of the given \a size. @@ -927,7 +927,6 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, Attachment } /*! - \fn QOpenGLFramebufferObject::~QOpenGLFramebufferObject() Destroys the framebuffer object and frees any allocated resources. */ diff --git a/src/gui/opengl/qopenglframebufferobject.h b/src/gui/opengl/qopenglframebufferobject.h index b9e61e9ee4..161054d1bf 100644 --- a/src/gui/opengl/qopenglframebufferobject.h +++ b/src/gui/opengl/qopenglframebufferobject.h @@ -49,8 +49,18 @@ #include <QtCore/qscopedpointer.h> -QT_BEGIN_NAMESPACE +#if defined(Q_CLANG_QDOC) +#undef GLuint +typedef unsigned int GLuint; +#undef GLenum +typedef unsigned int GLenum; +#undef GL_TEXTURE_2D +#define GL_TEXTURE_2D 0x0DE1 +#undef GLbitfield +typedef unsigned int GLbitfield; +#endif +QT_BEGIN_NAMESPACE class QOpenGLFramebufferObjectPrivate; class QOpenGLFramebufferObjectFormat; diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index 3ce88197d2..dfdef44b54 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -46,6 +46,17 @@ #include <QtGui/qvector4d.h> #include <QtGui/qmatrix4x4.h> +#if defined(Q_CLANG_QDOC) +#undef GLfloat +typedef double GLfloat; +#undef GLint +typedef int GLint; +#undef GLuint +typedef unsigned int GLuint; +#undef GLenum +typedef unsigned int GLenum; +#endif + QT_BEGIN_NAMESPACE |