summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qpaintengine_raster.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-06-24 07:22:16 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-06-24 07:22:16 (GMT)
commit83449457780f4321595ec5f15056474cc22061da (patch)
tree1efc45348916a58188fd1e8dbe0355bec843dd6e /src/gui/painting/qpaintengine_raster.cpp
parent3c2396d4d1e1b398dade04629af2854368b65efb (diff)
parentd0f83cb45f27b2814326344ded548a02c2ebe583 (diff)
downloadQt-83449457780f4321595ec5f15056474cc22061da.zip
Qt-83449457780f4321595ec5f15056474cc22061da.tar.gz
Qt-83449457780f4321595ec5f15056474cc22061da.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/painting/qpaintengine_raster.cpp')
-rw-r--r--src/gui/painting/qpaintengine_raster.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 37f7b6d..37a88a3 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -1322,6 +1322,7 @@ void QRasterPaintEngine::clip(const QRect &rect, Qt::ClipOperation op)
delete s->clip;
s->clip = clip;
+ s->clip->enabled = true;
s->flags.has_clip_ownership = true;
} else { // intersect clip with current clip
@@ -1338,6 +1339,7 @@ void QRasterPaintEngine::clip(const QRect &rect, Qt::ClipOperation op)
s->clip->setClipRect(base->clipRect & clipRect);
else
s->clip->setClipRegion(base->clipRegion & clipRect);
+ s->clip->enabled = true;
} else {
QPaintEngineEx::clip(rect, op);
return;