diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-18 14:51:35 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-18 14:51:35 (GMT) |
commit | 396eeb3f71c1c7edd861da1c8a8ec3086348502e (patch) | |
tree | 3ff6670ef4b192fd0993e0e9629e616570a6475a /src/gui/painting/qpaintengine_raster.cpp | |
parent | e356eed2fa3d8e62085d6bd72caba9d11c40bacf (diff) | |
parent | 31ed96ef2c34429d61a5d9d1c1b7fe4fc17c708b (diff) | |
download | Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.zip Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.gz Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.bz2 |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
tests/auto/qpainter/tst_qpainter.cpp
translations/qt_ru.ts
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 1d3e38e..78515ac 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -3996,7 +3996,7 @@ void QRasterPaintEnginePrivate::initializeRasterizer(QSpanData *data) const QClipData *c = clip(); if (c) { const QRect r(QPoint(c->xmin, c->ymin), - QPoint(c->xmax, c->ymax)); + QSize(c->xmax - c->xmin, c->ymax - c->ymin)); clipRect = clipRect.intersected(r); blend = data->blend; } else { |