summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-05-07 12:31:39 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-05-07 12:31:39 (GMT)
commit48c414f5f5f60aafa0c7b45bafb2b8374eb63e01 (patch)
tree8466525b08210f817158b289bb2f384d01e9a339 /src
parenta671c8442d1024e6fd842c05b35ad682a48de76d (diff)
parenteb490fea127fbfa7dac835e63f8307b34caf68ff (diff)
downloadQt-48c414f5f5f60aafa0c7b45bafb2b8374eb63e01.zip
Qt-48c414f5f5f60aafa0c7b45bafb2b8374eb63e01.tar.gz
Qt-48c414f5f5f60aafa0c7b45bafb2b8374eb63e01.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src')
-rw-r--r--src/gui/painting/qpdf.cpp9
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)