diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-05 05:04:58 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-05 05:04:58 (GMT) |
| commit | 1490fdf8aaff2fa3f783bac4270e8c07ceaea304 (patch) | |
| tree | e06fe14864e3f884bf1230522c0b7060d0f3e560 /src/gui/graphicsview/qgraphicsview.cpp | |
| parent | 5343b49bbff4d813da1faf3fc4fc406441faccf0 (diff) | |
| parent | e4e3b8f336b6c7d0dd52d4b8af96fee1dc628783 (diff) | |
| download | Qt-1490fdf8aaff2fa3f783bac4270e8c07ceaea304.zip Qt-1490fdf8aaff2fa3f783bac4270e8c07ceaea304.tar.gz Qt-1490fdf8aaff2fa3f783bac4270e8c07ceaea304.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/graphicsitems/qmlgraphicsloader.cpp
Diffstat (limited to 'src/gui/graphicsview/qgraphicsview.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index f72aa8a..9856b1a 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -3251,10 +3251,13 @@ void QGraphicsView::paintEvent(QPaintEvent *event) // Determine the exposed region d->exposedRegion = event->region(); + if (d->exposedRegion.isEmpty()) + d->exposedRegion = viewport()->rect(); QRectF exposedSceneRect = mapToScene(d->exposedRegion.boundingRect()).boundingRect(); // Set up the painter QPainter painter(viewport()); + painter.setClipRect(exposedSceneRect, Qt::IntersectClip); #ifndef QT_NO_RUBBERBAND if (d->rubberBanding && !d->rubberBandRect.isEmpty()) painter.save(); |