diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 16:37:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 16:37:56 (GMT) |
| commit | 9b21487794b3984b5075f03e5639a8c4bf5f2813 (patch) | |
| tree | f327883ac4518bf6fbdaa28d239e3145cd4bb8d3 /src | |
| parent | 412512466183c021cee95002f57215707fbfb8ca (diff) | |
| parent | f0076dfed6543c622418359b3c217c171249cfb3 (diff) | |
| download | Qt-9b21487794b3984b5075f03e5639a8c4bf5f2813.zip Qt-9b21487794b3984b5075f03e5639a8c4bf5f2813.tar.gz Qt-9b21487794b3984b5075f03e5639a8c4bf5f2813.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Regression: QGraphicsScene::render fails to render the entire scene correctly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 4472272..43fa24a 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -4678,7 +4678,8 @@ void QGraphicsScenePrivate::drawSubtreeRecursive(QGraphicsItem *item, QPainter * if (widget) item->d_ptr->paintedViewBoundingRects.insert(widget, viewBoundingRect); viewBoundingRect.adjust(-1, -1, 1, 1); - drawItem = exposedRegion ? exposedRegion->intersects(viewBoundingRect) : !viewBoundingRect.isEmpty(); + drawItem = exposedRegion ? exposedRegion->intersects(viewBoundingRect) + : !viewBoundingRect.normalized().isEmpty(); if (!drawItem) { if (!itemHasChildren) return; |