diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-27 08:40:32 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-27 08:40:32 (GMT) |
| commit | aa911fcc8cae12c92941e21a02b7621d4e4bf118 (patch) | |
| tree | fb9a70e68e60d46a6e773ca82d67411a2720f60c /src | |
| parent | f50cfa3a5a6b8408276e540a52f4232568c871fa (diff) | |
| parent | 9401bfd65309da360df6c2bda5f910b1507e7888 (diff) | |
| download | Qt-aa911fcc8cae12c92941e21a02b7621d4e4bf118.zip Qt-aa911fcc8cae12c92941e21a02b7621d4e4bf118.tar.gz Qt-aa911fcc8cae12c92941e21a02b7621d4e4bf118.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvg/qpaintengine_vg.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index ba97d4f..6b829dd 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -1570,12 +1570,6 @@ void QVGPaintEngine::clip(const QRect &rect, Qt::ClipOperation op) d->dirty |= QPaintEngine::DirtyClipRegion; - // If we have a non-simple transform, then use path-based clipping. - if (op != Qt::NoClip && !clipTransformIsSimple(d->transform)) { - QPaintEngineEx::clip(rect, op); - return; - } - switch (op) { case Qt::NoClip: { @@ -1612,12 +1606,6 @@ void QVGPaintEngine::clip(const QRegion ®ion, Qt::ClipOperation op) d->dirty |= QPaintEngine::DirtyClipRegion; - // If we have a non-simple transform, then use path-based clipping. - if (op != Qt::NoClip && !clipTransformIsSimple(d->transform)) { - QPaintEngineEx::clip(region, op); - return; - } - switch (op) { case Qt::NoClip: { |