aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@theqtcompany.com>2015-09-19 07:59:14 +0200
committerMitch Curtis <mitch.curtis@theqtcompany.com>2015-09-21 13:03:41 +0000
commit4c1a7050506fddbf0199d928b2e6db7d6a2047ed (patch)
tree22256b4e289580718cc085520a3435ae4745f5a0 /src/quick/doc
parent14bd3aa88f1f3dddecb423abaeac5282762ee8e7 (diff)
Fix typo in scenegraph documentation
Change-Id: Iacab320dcedfc7ba1d12703f63a812f2660929b7 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'src/quick/doc')
-rw-r--r--src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
index 8ef77dac4c..0a8fc2ab0a 100644
--- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
+++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
@@ -585,7 +585,7 @@ with multiple windows.
\section1 Batch Roots
- In addition to mergin compatible primitives into batches, the
+ In addition to merging compatible primitives into batches, the
default renderer also tries to minimize the amount of data that
needs to be sent to the GPU for every frame. The default renderer
identifies subtrees which belong together and tries to put these