diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-18 15:53:04 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-18 15:53:04 (GMT) |
commit | 06d60696fcc88f058b53d08785cc01a580dfb4ed (patch) | |
tree | de9bc473225b58ab413d9002b4ad811ddf742673 /src/gui/graphicsview/qgraphicstransform.cpp | |
parent | 4082e4711a1c54947429b15504caf778c6da22d0 (diff) | |
parent | 9f18a1ad5ce32dd397642a4c03fa1fcb21fb9456 (diff) | |
download | Qt-06d60696fcc88f058b53d08785cc01a580dfb4ed.zip Qt-06d60696fcc88f058b53d08785cc01a580dfb4ed.tar.gz Qt-06d60696fcc88f058b53d08785cc01a580dfb4ed.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Check correctly before including SSE4.2 header.
Fixed crash when destroying QGLWidget
Prevent crash in GL 2 engine when stroking null rectangle.
Compile fix.
Documentation update for new switching events.
Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
Doc: Fixing typo
Fix possible missing glyphs in text when using GL engine
Diffstat (limited to 'src/gui/graphicsview/qgraphicstransform.cpp')
-rw-r--r-- | src/gui/graphicsview/qgraphicstransform.cpp | 2 |
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 |