diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 01:44:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 01:44:59 (GMT) |
| commit | 64a6d6dafbf313a9cd1db03045230187c6c547d5 (patch) | |
| tree | 6577166f750e968f7e3f47c4d0c934b4be2bd149 /src | |
| parent | 3e3f7cb43a2c26e5b28ce0a5aafa50c11b00583a (diff) | |
| parent | 7f243aa938498837e32b318a38d81d9cca4b8fe0 (diff) | |
| download | Qt-64a6d6dafbf313a9cd1db03045230187c6c547d5.zip Qt-64a6d6dafbf313a9cd1db03045230187c6c547d5.tar.gz Qt-64a6d6dafbf313a9cd1db03045230187c6c547d5.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
When using OpenVG alpha mask, turn off scissor-as-mask
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvg/qpaintengine_vg.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index da47f06..c46bc27 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -2062,6 +2062,7 @@ void QVGPaintEngine::clip(const QPainterPath &path, Qt::ClipOperation op) void QVGPaintEnginePrivate::ensureMask (QVGPaintEngine *engine, int width, int height) { + scissorMask = false; if (maskIsSet) { vgMask(VG_INVALID_HANDLE, VG_FILL_MASK, 0, 0, width, height); maskRect = QRect(); |