diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-13 10:14:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-13 10:14:24 (GMT) |
| commit | 060155f2819b4dbad9d91cffa8af1d6ec7e4338c (patch) | |
| tree | 1a4914c3d9a62ecfa5dbf200ddb120801a531b83 /src/opengl | |
| parent | 6944a72cd26a5e3611ebd305ec665bc4c0fcee12 (diff) | |
| parent | 8911ed8bfe7f918b93c758f9b5d93274b37739e6 (diff) | |
| download | Qt-060155f2819b4dbad9d91cffa8af1d6ec7e4338c.zip Qt-060155f2819b4dbad9d91cffa8af1d6ec7e4338c.tar.gz Qt-060155f2819b4dbad9d91cffa8af1d6ec7e4338c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits)
Optimized QLocale to access system locale on demand.
Fix QRegion under Mac OS X.
update according to Thiago's comments.
Changes: add functionality for dbus auto start to qt
Add license header to this file
readdir64 is not available on HP-UX
Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath
qdoc3: Completed handling of the new \pagekeywords command.
Wrong cursor shown by the parent window after setOverrideCursor().
Fixed Mac OS X compile time error by using GLint for temp.
qdoc3: Added curly braces in switch statement for braindead compiler.
qdoc: Added a build rule for the documentation - disabled by default.
Doc: Added the qdoc manual to the repository for future maintenance.
qdoc3: Fixed bug in creation of qt.pageindex.
qdoc3: Added capability to create qt.pageindex.
Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
Cocoa: Implement our own NSApplication subclass
Cocoa: Menu in menubar stays highlighted
qdoc: Made a temporary fix for comment highlighting.
Doc: Tidied up the class layout and removed an unnecessary image.
...
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index a0b332d..c18129d 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -3086,7 +3086,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; } |