diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 14:36:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 14:36:25 (GMT) |
| commit | dba104808411c7eb4321cb13333101c6335b3621 (patch) | |
| tree | b59bf6fc5eba0b231d4a47c81a573fd68dd509a2 /src | |
| parent | b8fa411051eda208dfd0e0c658710c77a04ce998 (diff) | |
| parent | a8af0c1aba81716bd0f609b1d9afe5c10951b303 (diff) | |
| download | Qt-dba104808411c7eb4321cb13333101c6335b3621.zip Qt-dba104808411c7eb4321cb13333101c6335b3621.tar.gz Qt-dba104808411c7eb4321cb13333101c6335b3621.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Changed canonical paths to absolute paths in symmake.
Don't use vgClear() for semi-transparent brushes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvg/qpaintengine_vg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index 6813d2f..da47f06 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -2399,7 +2399,7 @@ void QVGPaintEngine::fillRect(const QRectF &rect, const QBrush &brush) return; // Check to see if we can use vgClear() for faster filling. - if (brush.style() == Qt::SolidPattern && + if (brush.style() == Qt::SolidPattern && brush.isOpaque() && clipTransformIsSimple(d->transform) && d->opacity == 1.0f && clearRect(rect, brush.color())) { return; @@ -2442,7 +2442,7 @@ void QVGPaintEngine::fillRect(const QRectF &rect, const QColor &color) Q_D(QVGPaintEngine); // Check to see if we can use vgClear() for faster filling. - if (clipTransformIsSimple(d->transform) && d->opacity == 1.0f && + if (clipTransformIsSimple(d->transform) && d->opacity == 1.0f && color.alpha() == 255 && clearRect(rect, color)) { return; } |