diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-21 22:32:21 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-21 22:32:21 +1000 |
| commit | 45f372edda9d43bc98c7742a5dfdd89e4efbe225 (patch) | |
| tree | 4b5e282a5959b2bc16a9f3d913e37791f16d9391 /doc | |
| parent | 86e5445e210f812e3f3059e175cce323c68ac216 (diff) | |
| parent | 1075b98d6557e00618105a9d2ba58d1df9812633 (diff) | |
| download | qt4-tools-45f372edda9d43bc98c7742a5dfdd89e4efbe225.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Removed demo files accidentally introduced by commit 3abaecc3.
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.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/index.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | 4 | ||||
| -rw-r--r-- | doc/src/snippets/myscrollarea.cpp | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index bd21a12f41..af418e0781 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -37,7 +37,8 @@ \enddiv \list \o \l{Qt Features Overview} - \o \l{Introduction to Qt Quick}{Qt Quick} + \o \l{How to Learn Qt} + \o \l{Introduction to Qt Quick} \o \l{external: Qt Mobility Manual}{Qt Mobility} \o \l{Qt WebKit} \endlist diff --git a/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp b/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp index aa5225a5e8..812adf967f 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] diff --git a/doc/src/snippets/myscrollarea.cpp b/doc/src/snippets/myscrollarea.cpp index 93b487d317..9a41ed84d5 100644 --- a/doc/src/snippets/myscrollarea.cpp +++ b/doc/src/snippets/myscrollarea.cpp @@ -98,8 +98,8 @@ void MyScrollArea::updateArea() QSize areaSize = viewport()->size(); QSize widgetSize = widget->size(); - verticalScrollBar()->setPageStep(widgetSize.height()); - horizontalScrollBar()->setPageStep(widgetSize.width()); + verticalScrollBar()->setPageStep(areaSize.height()); + horizontalScrollBar()->setPageStep(areaSize.width()); verticalScrollBar()->setRange(0, widgetSize.height() - areaSize.height()); horizontalScrollBar()->setRange(0, widgetSize.width() - areaSize.width()); updateWidgetPosition(); |