diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 01:32:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 01:32:51 (GMT) |
| commit | 234150dd74cb26eb3257111f041dcb1af49b8483 (patch) | |
| tree | 70e3fa857129c47dd974f201e48cedab0bb94be3 /src/opengl/qglshaderprogram.cpp | |
| parent | c633ce4346fa04584e5168b77924ca6a42601435 (diff) | |
| parent | 0601f9f764c55390a2cdd71d91c3ea25c57f2a6d (diff) | |
| download | Qt-234150dd74cb26eb3257111f041dcb1af49b8483.zip Qt-234150dd74cb26eb3257111f041dcb1af49b8483.tar.gz Qt-234150dd74cb26eb3257111f041dcb1af49b8483.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: (21 commits)
Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath
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.
Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.
Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.
qdoc: Removed debugging code.
Doc: Updated the configuration file for the Simplified Chinese docs.
qdoc: Standardized encoding names and updated the Chinese config files.
Doc: Added Simplified Chinese documents and build rules for them.
qdoc: Added support for different source and output character encodings.
...
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
| -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; } |