diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-17 20:00:03 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-17 20:00:03 +0200 |
| commit | 91a1f7a1c408052b1d284d6b901819964e338fe5 (patch) | |
| tree | df7103f0ea0cb9d98f4b641d72c0f8b0ebdf2498 /src/gui/painting/qpdf.cpp | |
| parent | 94a3356d5eb7b255d439efe2699bf3a9b025e8eb (diff) | |
| parent | 509ef11ab4ba6165c16d9d311c4a1bf7cdfd2528 (diff) | |
| download | qt4-tools-91a1f7a1c408052b1d284d6b901819964e338fe5.tar.gz | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
Diffstat (limited to 'src/gui/painting/qpdf.cpp')
| -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 44049c0d8f..6e02435a43 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) |