diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-16 10:19:02 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-16 10:19:02 +0200 |
| commit | 276d60a4d6c9d1b72c4aa7df1f86e7ce9097beeb (patch) | |
| tree | 73130ce8a80181fb9d234028c5057d7eb86f02ab /src/widgets/graphicsview/qgraphicslayout_p.cpp | |
| parent | 850b602c7a72635eb37a998089ee085d5d505c34 (diff) | |
| parent | 173099696f44073441975febfa35ddfb3585e8c5 (diff) | |
Merge remote branch 'origin/master' into refactor
Conflicts:
src/modules/qt_openvg.pri
src/widgets/to_be_moved/qlinecontrol_p.h
Diffstat (limited to 'src/widgets/graphicsview/qgraphicslayout_p.cpp')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicslayout_p.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/widgets/graphicsview/qgraphicslayout_p.cpp b/src/widgets/graphicsview/qgraphicslayout_p.cpp index c325602cc6..05e6cdf599 100644 --- a/src/widgets/graphicsview/qgraphicslayout_p.cpp +++ b/src/widgets/graphicsview/qgraphicslayout_p.cpp @@ -180,9 +180,14 @@ void QGraphicsLayoutPrivate::activateRecursive(QGraphicsLayoutItem *item) { if (item->isLayout()) { QGraphicsLayout *layout = static_cast<QGraphicsLayout *>(item); - if (layout->d_func()->activated) - layout->invalidate(); - + if (layout->d_func()->activated) { + if (QGraphicsLayout::instantInvalidatePropagation()) { + return; + } else { + layout->invalidate(); // ### LOOKS SUSPICIOUSLY WRONG!!??? + } + } + for (int i = layout->count() - 1; i >= 0; --i) { QGraphicsLayoutItem *childItem = layout->itemAt(i); if (childItem) |