diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-09-01 15:37:45 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-09-03 14:22:58 (GMT) |
| commit | 5fff965369168bc3db164b33ecf6973059567e48 (patch) | |
| tree | b34e6f7817255bb188cc0594bdfb859b295950ad /src/opengl/qpixmapdata_gl.cpp | |
| parent | d05aa6a493b532b90466cc106c0f8bb05d8ca41f (diff) | |
| download | Qt-5fff965369168bc3db164b33ecf6973059567e48.zip Qt-5fff965369168bc3db164b33ecf6973059567e48.tar.gz Qt-5fff965369168bc3db164b33ecf6973059567e48.tar.bz2 | |
Fixed issues with using GLenum in public API on mac.
The type of GLenum was changed between 10.4 and 10.5, so to support
compiling on one and deploying on the other we need this hack. Also
get rid of the complex QGLFramebufferObjectFormat constructor in
favor of a simple default constructor and setters, which is more
Qt-ish anyway, and avoids ambiguities on mac.
Reviewed-by: Trond
Diffstat (limited to 'src/opengl/qpixmapdata_gl.cpp')
| -rw-r--r-- | src/opengl/qpixmapdata_gl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index 5e87e96..b6f5012 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -467,7 +467,7 @@ QPaintEngine* QGLPixmapData::paintEngine() const QGLFramebufferObjectFormat format; format.setAttachment(QGLFramebufferObject::CombinedDepthStencil); format.setSamples(4); - format.setInternalFormat(m_hasAlpha ? GL_RGBA : GL_RGB); + format.setInternalFormat(GLenum(m_hasAlpha ? GL_RGBA : GL_RGB)); m_renderFbo = qgl_fbo_pool()->acquire(size(), format); |