diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-27 02:57:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-27 02:57:03 (GMT) |
| commit | 09def0110c6e91ed219ba0ef4d2d9acb8f563241 (patch) | |
| tree | 4cbc0c7af284cc37e6c68fa3d99887681ecf81e6 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 174e40c348eb45417f44bcf4077ca751204d6f9e (diff) | |
| parent | 53794d94994cb3149581b1a91762dfa2d6defac0 (diff) | |
| download | Qt-09def0110c6e91ed219ba0ef4d2d9acb8f563241.zip Qt-09def0110c6e91ed219ba0ef4d2d9acb8f563241.tar.gz Qt-09def0110c6e91ed219ba0ef4d2d9acb8f563241.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (246 commits)
Do not unconditionally use pkg-config in .pro files
Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e
Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd
Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0
Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4b
Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007
Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59
uikit: update SDK setting for the simulator
Add option to compare to different platform in lancelot autotest
uikit: Use release Qt for simulator, update README
Automatic closing of input panel on uikit when QML item looses focus.
Fixed compile error in qwindowsurface_qws.cpp.
Fixed regression introduced by 5842d19cf3dff37a85c.
Remove DerivedSources.pro from WebKit.
Support debuggable in the makefile build system
QLabel documentation: add warning about sanitizing input
runonphone: fix failure to terminate
Fix license headers in new files from coda patch
runonphone: command line args improperly passed to TRK after CODA patch
Mark all Symbian debug binaries debuggable by default
...
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
| -rw-r--r-- | doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp b/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp index aa5225a..812adf9 100644 --- a/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp +++ b/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp @@ -52,7 +52,7 @@ program.bind(); //! [1] program.addShaderFromSourceCode(QGLShader::Vertex, "attribute highp vec4 vertex;\n" - "attribute mediump mat4 matrix;\n" + "uniform highp mat4 matrix;\n" "void main(void)\n" "{\n" " gl_Position = matrix * vertex;\n" @@ -67,7 +67,7 @@ program.link(); program.bind(); int vertexLocation = program.attributeLocation("vertex"); -int matrixLocation = program.attributeLocation("matrix"); +int matrixLocation = program.uniformLocation("matrix"); int colorLocation = program.uniformLocation("color"); //! [1] |