diff options
| author | Simo Fält <simo.falt@nokia.com> | 2012-03-29 13:35:50 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@nokia.com> | 2012-03-29 13:35:50 +0300 |
| commit | ca572c0b806388cbc58dcba4ab6d7cc25d89366a (patch) | |
| tree | f0d6175666984d0184dfe2605e1bd9e91fb02157 /src/gui/painting/qpaintengine_raster.cpp | |
| parent | 064dc31b190f737e2ae83d3629c31512cb69435c (diff) | |
| parent | 4451010026aa559ec0f88e096f7f6afe28c34b6f (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbaseqt-v5.0.0-alpha1
Diffstat (limited to 'src/gui/painting/qpaintengine_raster.cpp')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index b5e8bca7e0..15f344bf81 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -737,7 +737,7 @@ void QRasterPaintEngine::updatePen(const QPen &pen) s->flags.fast_pen = pen_style > Qt::NoPen && s->penData.blend && ((pen.isCosmetic() && penWidth <= 1) - || (s->flags.tx_noshear && penWidth * s->txscale <= 1)); + || (!pen.isCosmetic() && s->flags.tx_noshear && penWidth * s->txscale <= 1)); s->flags.non_complex_pen = qpen_capStyle(s->lastPen) <= Qt::SquareCap && s->flags.tx_noshear; |