summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-11-19 23:00:13 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-11-19 23:00:13 (GMT)
commitbcba1271a09c48e0bfd5477dd6cf0955ba55b077 (patch)
tree528bc50c5f98b98bd3ad34b0e8f92cc33e73877d /src/gui/graphicsview
parent2530a8b70da9b172ccd041a347f2556c3140c147 (diff)
parent0cfa6daa4776cd78370e644fae3005ae432b83c7 (diff)
downloadQt-bcba1271a09c48e0bfd5477dd6cf0955ba55b077.zip
Qt-bcba1271a09c48e0bfd5477dd6cf0955ba55b077.tar.gz
Qt-bcba1271a09c48e0bfd5477dd6cf0955ba55b077.tar.bz2
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/gui/graphicsview')
-rw-r--r--src/gui/graphicsview/qgraphicstransform.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp
index 1f155c6..d495da2 100644
--- a/src/gui/graphicsview/qgraphicstransform.cpp
+++ b/src/gui/graphicsview/qgraphicstransform.cpp
@@ -54,7 +54,7 @@
instances to one QGraphicsItem. Each QGraphicsTransform is applied in
order, one at a time, to the QGraphicsItem it's assigned to.
- QGraphicsTransform is particularily useful for animations. Whereas
+ QGraphicsTransform is particularly useful for animations. Whereas
QGraphicsItem::setTransform() lets you assign any transform directly to an
item, there is no direct way to interpolate between two different
transformations (e.g., when transitioning between two states, each for