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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (68 commits)
  Doc: Added a link to the How to Learn Qt document.
  Doc: Fixed shader program snippet.
  Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.
  Doc: Moved general notes about character conversion.
  Fix the timeout calculation for futexes in QMutex.
  namespace fix
  fix build
  get rid of unwanted dependencies and unused header includes
  sync qws_dataDir() with coreapp's internal qws_dataDir()
  Added Solaris build fix to the changes file.
  Documentation fix.
  make argument quoting code on windows less arcane
  fix argument quoting on windows
  Fix potential crash when clicking in a text edit
  Compensate for different rounding rule in CG engine
  Remove broken link to Symbian.org documentation.
  Check engine existence before increasing reference count
  Keep reference count for cached font engines in QTextEngine
  Optimize text layout.
  Fix compiler warning in qtextdocument.cpp
  ...

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]