diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-06 17:09:27 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-06 17:09:27 (GMT) |
| commit | 7ee944a14582cd7202b4a8e94adc06e7ae5855a6 (patch) | |
| tree | 0684ab4a4e02dc72c2e1f5bc72baaf55f0d0310f /src/gui/graphicsview/qgraphicsscene_p.h | |
| parent | cd58bc13a4a37543d76a79b3cee7cd95bde0a14b (diff) | |
| parent | 12d14efb2e1df3188c7c0001492f24fd193a11a9 (diff) | |
| download | Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.zip Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.tar.gz Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6
Conflicts:
dist/changes-4.6.0
Diffstat (limited to 'src/gui/graphicsview/qgraphicsscene_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index c675c56..fdec466 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -241,6 +241,7 @@ public: item->d_ptr->fullUpdatePending = 0; item->d_ptr->ignoreVisible = 0; item->d_ptr->ignoreOpacity = 0; +#ifndef QT_NO_GRAPHICSEFFECT QGraphicsEffect::ChangeFlags flags; if (item->d_ptr->notifyBoundingRectChanged) { flags |= QGraphicsEffect::SourceBoundingRectChanged; @@ -250,12 +251,15 @@ public: flags |= QGraphicsEffect::SourceInvalidated; item->d_ptr->notifyInvalidated = 0; } +#endif //QT_NO_GRAPHICSEFFECT if (recursive) { for (int i = 0; i < item->d_ptr->children.size(); ++i) resetDirtyItem(item->d_ptr->children.at(i), recursive); } +#ifndef QT_NO_GRAPHICSEFFECT if (flags && item->d_ptr->graphicsEffect) item->d_ptr->graphicsEffect->sourceChanged(flags); +#endif //QT_NO_GRAPHICSEFFECT } inline void ensureSortedTopLevelItems() |