aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/coreapi/qsgnode.cpp
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-03-05 11:39:24 +1000
committerMatthew Vogt <matthew.vogt@nokia.com>2012-03-05 11:39:54 +1000
commit0284817d6cd7e17afa8da26ee6e9199100754446 (patch)
treec351d55d5a606c81c72e481f846b9b9e2603c883 /src/quick/scenegraph/coreapi/qsgnode.cpp
parent377eb94eb19dafeca20d12bc6b624f1779fae514 (diff)
parent36bd7f616f37f5f60e59bce1f0d8970248d627de (diff)
Merge master <-> api_changes
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgnode.cpp')
-rw-r--r--src/quick/scenegraph/coreapi/qsgnode.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index b9eec27e82..5c14bd5bc7 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -777,9 +777,9 @@ QSGClipNode::~QSGClipNode()
Sets whether this clip node has a rectangular clip to \a rectHint.
This is an optimization hint which means that the renderer can
- use scissoring instead of stencil, which is significnatly faster.
+ use scissoring instead of stencil, which is significantly faster.
- When this hint is and it is applicable, the clip region will be
+ When this hint is set and it is applicable, the clip region will be
generated from clipRect() rather than geometry().
*/
@@ -791,7 +791,7 @@ void QSGClipNode::setIsRectangular(bool rectHint)
/*!
- \fn void QSGClipNode::clipRect() const
+ \fn QRectF QSGClipNode::clipRect() const
Returns the clip rect of this node.
*/