summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-05-26 06:40:54 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-05-26 07:10:49 (GMT)
commit51167b0f2f7b3989ed448160fda3209e9382663a (patch)
tree3b243ad1d7da6c10e515ebab43e5e584ed71402b
parentf8cb8f242817c94a3f368b01243a88918d211f1e (diff)
downloadQt-51167b0f2f7b3989ed448160fda3209e9382663a.zip
Qt-51167b0f2f7b3989ed448160fda3209e9382663a.tar.gz
Qt-51167b0f2f7b3989ed448160fda3209e9382663a.tar.bz2
Fix build failure on MacOS 10.4
It seems GLint is typedefed to long on 10.4. Reviewed-By: Rhys Weatherley
-rw-r--r--src/opengl/qglframebufferobject.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index 8af9f63..2b7ad4f 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -288,7 +288,7 @@ public:
~QGLFramebufferObjectPrivate() {}
void init(const QSize& sz, QGLFramebufferObject::Attachment attachment,
- GLenum internal_format, GLenum texture_target, int samples = 0);
+ GLenum internal_format, GLenum texture_target, GLint samples = 0);
bool checkFramebufferStatus() const;
GLuint texture;
GLuint fbo;
@@ -350,7 +350,7 @@ bool QGLFramebufferObjectPrivate::checkFramebufferStatus() const
}
void QGLFramebufferObjectPrivate::init(const QSize &sz, QGLFramebufferObject::Attachment attachment,
- GLenum texture_target, GLenum internal_format, int samples)
+ GLenum texture_target, GLenum internal_format, GLint samples)
{
ctx = const_cast<QGLContext *>(QGLContext::currentContext());
bool ext_detected = (QGLExtensions::glExtensions & QGLExtensions::FramebufferObject);
@@ -490,7 +490,7 @@ void QGLFramebufferObjectPrivate::init(const QSize &sz, QGLFramebufferObject::At
QT_CHECK_GLERROR();
format.setTextureTarget(target);
- format.setSamples(samples);
+ format.setSamples(int(samples));
format.setAttachment(fbo_attachment);
format.setInternalFormat(internal_format);
}