diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-26 16:38:15 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-26 16:38:15 +0200 |
| commit | 53d010a989aed878c21522cbaf0d75c7cf821b42 (patch) | |
| tree | ad236dfb3f01ef7e844b36358511f7afb0021659 /src | |
| parent | 23e03ee30dcd140a51073a0dd665bd871927d05e (diff) | |
| parent | bcb4dbebe2f6216842ce443bfc6d126943020a35 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QPainter::clipBoundingRect() for QRectF clip.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 8f54a2e944..35a74c9f16 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -2737,6 +2737,8 @@ QRectF QPainter::clipBoundingRect() const if (info.clipType == QPainterClipInfo::RectClip) r = info.rect; + else if (info.clipType == QPainterClipInfo::RectFClip) + r = info.rectf; else if (info.clipType == QPainterClipInfo::RegionClip) r = info.region.boundingRect(); else |