diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-03 08:01:59 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-08-03 08:01:59 +0000 |
| commit | 1c20a3b8b652a6179438da5c2b3a72183279cdfa (patch) | |
| tree | 6f587294732e840eff832768b916f17f82eb984e /examples/quick/scenegraph | |
| parent | dbf131fa70dc6269349f3b8d1bedd05203a0c3e4 (diff) | |
| parent | 74f0d15e08fe718fd406ac53e691e68f8ef46e11 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'examples/quick/scenegraph')
| -rw-r--r-- | examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc b/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc index 278f154781..d6eb711929 100644 --- a/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc +++ b/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc @@ -102,8 +102,8 @@ state and we use it to update the shader program with the current color. The previous state is passed in as a second parameter so that the user can update only that which has changed. In our - usecase, where all the colors are different, the updateState will - be called once for every node. + use case, where all the colors are different, the updateState() + function will be called once for every node. \snippet scenegraph/simplematerial/simplematerial.cpp 7 |