diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 20:06:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 20:06:36 (GMT) |
| commit | 4ad12bb65aa46b3ba1cd8aa43716c2832842a2ae (patch) | |
| tree | 6ac745fc40c41b0ee43824a8211847059157299c /src/gui/painting/qpainter.cpp | |
| parent | 8acb9028787c75682055afe2a5b494c78b8f944d (diff) | |
| parent | 8ffb49a4ac68b1c243b25343053e6e99f97ec2e7 (diff) | |
| download | Qt-4ad12bb65aa46b3ba1cd8aa43716c2832842a2ae.zip Qt-4ad12bb65aa46b3ba1cd8aa43716c2832842a2ae.tar.gz Qt-4ad12bb65aa46b3ba1cd8aa43716c2832842a2ae.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:
Fixes crash in QGraphicsItem's destructor.
Doc: Fixing typo
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index ab9707d..3f6586d 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -9085,7 +9085,7 @@ void QPainter::drawPixmapFragments(const PixmapFragment *fragments, int fragment QPainter::drawPixmapFragments() function. The variables \a x, \a y, \a width and \a height are used to calculate the target rectangle that is drawn. \a x and \a y denotes the center of the target rectangle. The \a - width and \a heigth in the target rectangle is scaled by the \a scaleX and + width and \a height in the target rectangle is scaled by the \a scaleX and \a scaleY values. The resulting target rectangle is then rotated \a rotation degrees around the \a x, \a y center point. |