diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-07 09:18:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-07 09:18:27 (GMT) |
| commit | 3108e5991abf2bff88ddf160baa3e955c956e155 (patch) | |
| tree | 793fb886c621c0b05fcb81f62ce873f76a396d37 /src | |
| parent | c2cea05b916490af6b89628fba0b135457251383 (diff) | |
| parent | 3e9f45c5d585aabb1964e3472211c5201661eca3 (diff) | |
| download | Qt-3108e5991abf2bff88ddf160baa3e955c956e155.zip Qt-3108e5991abf2bff88ddf160baa3e955c956e155.tar.gz Qt-3108e5991abf2bff88ddf160baa3e955c956e155.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:
Fixed line and point drawing for the PS/PDF generators.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qpdf.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index ee8b078..05341e3 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -971,12 +971,17 @@ void QPdfBaseEngine::drawPoints (const QPointF *points, int pointCount) if (!points) return; + Q_D(QPdfBaseEngine); QPainterPath p; for (int i=0; i!=pointCount;++i) { p.moveTo(points[i]); p.lineTo(points[i] + QPointF(0, 0.001)); } + + bool hadBrush = d->hasBrush; + d->hasBrush = false; drawPath(p); + d->hasBrush = hadBrush; } void QPdfBaseEngine::drawLines (const QLineF *lines, int lineCount) @@ -984,12 +989,16 @@ void QPdfBaseEngine::drawLines (const QLineF *lines, int lineCount) if (!lines) return; + Q_D(QPdfBaseEngine); QPainterPath p; for (int i=0; i!=lineCount;++i) { p.moveTo(lines[i].p1()); p.lineTo(lines[i].p2()); } + bool hadBrush = d->hasBrush; + d->hasBrush = false; drawPath(p); + d->hasBrush = hadBrush; } void QPdfBaseEngine::drawRects (const QRectF *rects, int rectCount) |