Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (59 commits)
  Revert "fix QFileInfo::isSymLink() for NTFS mount points"
  Fix typo for ifdef QT_NO_ACCESSIBILITY
  Call QAccessible::updateAccessibility when a widget is deleted
  Revert binary search in QTextEngine::findItem
  Remove a duplicate include line
  Save previous font engine for right bearing adjustment
  Symbian^3 workaround: Avoid usage of linked fonts.
  Make it possible to update a related table after an external update
  Fix compilation under OSX 10.7 or using llvm-gcc.
  Add test case name and drop parentheses for -datatags option.
  Adding QTDIR validation in tst_symbols autotest
  Disabled benchmarks referring to private headers.
  Add license header to printdatatags autotests
  Compile on symbian^3
  Compile on Symbian^3.
  Added -datatags option to QTestLib
  Fixed failure of tst_qxmlquery::evaluateToReceiver
  Fix typo in QFontDialog docs
  Reset previousGlyph once we reached a new text item
  Build Qt for Symbian on Mac/gcce again
  ...

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]