summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2009-11-04 09:06:57 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2009-11-04 09:06:57 (GMT)
commit47546dd3cae4cb6f1ca87621fb3752524f9d050d (patch)
tree1154d8164ae5a5bd8830db975c93358a3234ce0d
parent1400ce5b85fbe7c67899f5f62bfd276eecb21ae0 (diff)
downloadQt-47546dd3cae4cb6f1ca87621fb3752524f9d050d.zip
Qt-47546dd3cae4cb6f1ca87621fb3752524f9d050d.tar.gz
Qt-47546dd3cae4cb6f1ca87621fb3752524f9d050d.tar.bz2
Compile on Mac OS X
On Mac, there are compat overloads to e.g. setInternalTextureFormat() so we need to specify which function to call to avoid ambiguity. Reviewed-by: Samuel
-rw-r--r--src/opengl/qglpixmapfilter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp
index 8768fbc..0eaab28 100644
--- a/src/opengl/qglpixmapfilter.cpp
+++ b/src/opengl/qglpixmapfilter.cpp
@@ -518,7 +518,7 @@ bool QGLPixmapBlurFilter::processGL(QPainter *painter, const QPointF &pos, const
m_singlePass = false;
QGLFramebufferObjectFormat format;
- format.setInternalTextureFormat(GL_RGBA);
+ format.setInternalTextureFormat(GLenum(GL_RGBA));
QGLFramebufferObject *fbo = qgl_fbo_pool()->acquire(targetRect.size() / 2, format, true);
if (!fbo)