diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-26 12:40:47 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-26 12:40:47 (GMT) |
| commit | e3742c782d71ded65f007d6bb4401504f8369ac6 (patch) | |
| tree | a3a8fc258a768e400640eb6475390bffd5a5efd8 | |
| parent | f607562328a7c7f9ee0c7048aba365dcea042b4f (diff) | |
| parent | 2eaf970b886c4c5c70fbc8d3081f8b572d0cfdf5 (diff) | |
| download | Qt-e3742c782d71ded65f007d6bb4401504f8369ac6.zip Qt-e3742c782d71ded65f007d6bb4401504f8369ac6.tar.gz Qt-e3742c782d71ded65f007d6bb4401504f8369ac6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
| -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 72bb164..5f6e1d6 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -791,7 +791,7 @@ void QRasterPaintEngine::updatePen(const QPen &pen) if(pen_style == Qt::SolidLine) { s->stroker = &d->basicStroker; } else if (pen_style != Qt::NoPen) { - if (!d->dashStroker.data()) + if (!d->dashStroker) d->dashStroker.reset(new QDashStroker(&d->basicStroker)); if (pen.isCosmetic()) { d->dashStroker->setClipRect(d->deviceRect); |