diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-26 15:50:44 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-26 15:50:44 (GMT) |
| commit | 1be8c6dc12b0158955bf88af450982d6688754d9 (patch) | |
| tree | 1b80419c0b8ccd5bab30bc64cf64472b9f6b82c5 /doc/src | |
| parent | 2b7aaf18660fb6639a97b0421563696648384948 (diff) | |
| parent | 9385eebd22e005ff6027594ea643a8f46ed2e3e3 (diff) | |
| download | Qt-1be8c6dc12b0158955bf88af450982d6688754d9.zip Qt-1be8c6dc12b0158955bf88af450982d6688754d9.tar.gz Qt-1be8c6dc12b0158955bf88af450982d6688754d9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/examples/overpainting.qdoc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/examples/overpainting.qdoc b/doc/src/examples/overpainting.qdoc index 91100c0..b19b503 100644 --- a/doc/src/examples/overpainting.qdoc +++ b/doc/src/examples/overpainting.qdoc @@ -159,9 +159,10 @@ \snippet examples/opengl/overpainting/glwidget.cpp 7 - Once the list containing the object has been executed, the matrix stack - needs to be restored to its original state at the start of this function - before we can begin overpainting: + Once the list containing the object has been executed, the GL + states we changed and the matrix stack needs to be restored to its + original state at the start of this function before we can begin + overpainting: \snippet examples/opengl/overpainting/glwidget.cpp 8 |