diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-06-10 08:49:27 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-06-10 08:49:27 (GMT) |
| commit | aaabdb71da1671c02617f9d1db47672c06bcf7cd (patch) | |
| tree | 3f0b63e58ddffd9ae3b1d4a0916abb0ba25964fe /src | |
| parent | f0f12f3d1ad2041c57095edaa7683c5d3599a3e6 (diff) | |
| parent | b2edf6ee037decf53c7d2698863ba63742317acc (diff) | |
| download | Qt-aaabdb71da1671c02617f9d1db47672c06bcf7cd.zip Qt-aaabdb71da1671c02617f9d1db47672c06bcf7cd.tar.gz Qt-aaabdb71da1671c02617f9d1db47672c06bcf7cd.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 0810bb9..7ed2dfd 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -4311,7 +4311,7 @@ QClipData::QClipData(int height) clipSpanHeight = height; m_clipLines = 0; - allocated = height; + allocated = 0; m_spans = 0; xmin = xmax = ymin = ymax = 0; count = 0; @@ -4479,7 +4479,7 @@ void QClipData::fixup() */ void QClipData::setClipRect(const QRect &rect) { - if (rect == clipRect) + if (hasRectClip && rect == clipRect) return; // qDebug() << "setClipRect" << clipSpanHeight << count << allocated << rect; |