diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-23 12:42:34 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-23 12:42:34 (GMT) |
| commit | ac3b7548b5f08529c532c7a22b679921a09d4c50 (patch) | |
| tree | 207be7c3e11bcd520ed93ac03deefbedbf51ff5e /src/gui/graphicsview/qgraphicsview.cpp | |
| parent | be79229e9c454764d63262f46f686b3e1721ee2c (diff) | |
| parent | 0ba6a795f786dc19486551fed2344f394b144a08 (diff) | |
| download | Qt-ac3b7548b5f08529c532c7a22b679921a09d4c50.zip Qt-ac3b7548b5f08529c532c7a22b679921a09d4c50.tar.gz Qt-ac3b7548b5f08529c532c7a22b679921a09d4c50.tar.bz2 | |
Merge commit 'qt/master' into graphicssceneindex
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene_p.h
Diffstat (limited to 'src/gui/graphicsview/qgraphicsview.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 640f85b..94547a5 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -3200,8 +3200,8 @@ void QGraphicsView::paintEvent(QPaintEvent *event) // Items if (!(d->optimizationFlags & IndirectPainting)) { - d->scene->d_func()->drawSubtreeRecursive(0, &painter, viewTransform, &d->exposedRegion, - viewport(), 0); + d->scene->d_func()->drawItems(&painter, viewTransformed ? &viewTransform : 0, + &d->exposedRegion, viewport()); } else { // Find all exposed items bool allItems = false; |