diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 15:12:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 15:12:06 (GMT) |
| commit | a7bf1cfb1a75c35e837c01f4a5b0697fc8961148 (patch) | |
| tree | 2559d9b4c467553f29391398fe4b56a62a1a627b /src | |
| parent | 739cf93e212c27a5880ef4cb50ddf4d238ab236d (diff) | |
| parent | 73fa0f87c26a3f5bf17746ec91d05264f0020093 (diff) | |
| download | Qt-a7bf1cfb1a75c35e837c01f4a5b0697fc8961148.zip Qt-a7bf1cfb1a75c35e837c01f4a5b0697fc8961148.tar.gz Qt-a7bf1cfb1a75c35e837c01f4a5b0697fc8961148.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 8dc15bf..e58b93c 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -1759,7 +1759,7 @@ void QGraphicsScene::render(QPainter *painter, const QRectF &target, const QRect painter->save(); // Transform the painter. - painter->setClipRect(targetRect); + painter->setClipRect(targetRect, Qt::IntersectClip); QTransform painterTransform; painterTransform *= QTransform() .translate(targetRect.left(), targetRect.top()) |