diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-21 13:13:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-21 13:13:57 (GMT) |
| commit | d9e7e75666ace6ffc57fbfc090cbcf8a749afc2d (patch) | |
| tree | 8406033ad82f43d30a3cab7320de75b76108f955 | |
| parent | 81cc6d57907eb080e255a6e3d33a88f27aa70437 (diff) | |
| parent | 5bd4db40eb545c0e5ff121876630ae8b952e957d (diff) | |
| download | Qt-d9e7e75666ace6ffc57fbfc090cbcf8a749afc2d.zip Qt-d9e7e75666ace6ffc57fbfc090cbcf8a749afc2d.tar.gz Qt-d9e7e75666ace6ffc57fbfc090cbcf8a749afc2d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix to pen state handling in OpenVG paint engine.
| -rw-r--r-- | src/openvg/qpaintengine_vg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index b90811d..a15f0c3 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -1472,7 +1472,7 @@ void QVGPaintEnginePrivate::draw (VGPath path, const QPen& pen, const QBrush& brush, VGint rule) { VGbitfield mode = 0; - if (pen.style() != Qt::NoPen) { + if (qpen_style(pen) != Qt::NoPen && qbrush_style(qpen_brush(pen)) != Qt::NoBrush) { ensurePen(pen); mode |= VG_STROKE_PATH; } |