summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-04 12:38:25 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-04 12:38:25 (GMT)
commitfe6608c09664d7daab50dd4efc8bac9ab8fad171 (patch)
treea99f85f5e77dd1bc5706426ef4b32310ddc4ad4f
parent4d53a691aaac9789ddd4f9d4e968d28ace2181ca (diff)
parentf2e3ef4e1eb656e1ce9f980a7d7bf63444b02504 (diff)
downloadQt-fe6608c09664d7daab50dd4efc8bac9ab8fad171.zip
Qt-fe6608c09664d7daab50dd4efc8bac9ab8fad171.tar.gz
Qt-fe6608c09664d7daab50dd4efc8bac9ab8fad171.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Set no brush when the brush is a solid patern transparent color.
-rw-r--r--src/gui/painting/qpdf.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index f5f7c3c..29e6a88 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -1156,6 +1156,8 @@ void QPdfBaseEngine::updateState(const QPaintEngineState &state)
}
if (flags & DirtyBrush) {
d->brush = state.brush();
+ if (d->brush.color().alpha() == 0 && d->brush.style() == Qt::SolidPattern)
+ d->brush.setStyle(Qt::NoBrush);
d->hasBrush = d->brush.style() != Qt::NoBrush;
}
if (flags & DirtyBrushOrigin) {