summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-11 12:28:09 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-11 12:28:09 (GMT)
commit638b4edeba905facb2ae7a841214b048c0010008 (patch)
tree875818c687599aacbfbec5f78b86ccf4152c5b73
parentfe7f5f8a183099b8503bb25d69fe5939014e0009 (diff)
downloadQt-638b4edeba905facb2ae7a841214b048c0010008.zip
Qt-638b4edeba905facb2ae7a841214b048c0010008.tar.gz
Qt-638b4edeba905facb2ae7a841214b048c0010008.tar.bz2
Fixed Mac OS X compile time error by using GLint for temp.
The GLint is then returned as an int, which is ok.
-rw-r--r--src/opengl/qglshaderprogram.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 170b650..2a86c91 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -3084,7 +3084,7 @@ void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x4 *
*/
int QGLShaderProgram::maxGeometryOutputVertices() const
{
- int n;
+ GLint n;
glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT, &n);
return n;
}