aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-09-08 17:39:02 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-10 12:26:28 +0200
commit5b4c2f5910052159443f707de2071f63e83b5a5d (patch)
treefc561f8bdebea3c941610b9addcfb9d3666c64ae /src/quick/scenegraph
parent4ec2d5a489b922beb16fcd1cdf8199a862244ebb (diff)
doc: fix some more typos
Change-Id: I7fa055049b9e5900d597754c6004febb153de12b Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r--src/quick/scenegraph/coreapi/qsgmaterial.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
index 8d37992928..78c9c80ce1 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
@@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE
The attributeNames() returns the name of the attributes used in the
vertexShader(). These are used in the default implementation of
- activate() and deactive() to decide whice vertex registers are enabled.
+ activate() and deactivate() to decide whice vertex registers are enabled.
The initialize() function is called during program creation to allow
subclasses to prepare for use, such as resolve uniform names in the