diff options
| author | Leonardo Sobral Cunha <leo.cunha@nokia.com> | 2009-07-30 10:23:49 (GMT) |
|---|---|---|
| committer | Leonardo Sobral Cunha <leo.cunha@nokia.com> | 2009-07-30 10:23:49 (GMT) |
| commit | fbe103bd39fcef2b873aae31dcfee9604237a95e (patch) | |
| tree | 1407bc256a512722e40fcb0b940c3880eb503e62 /src | |
| parent | e181f8754bccb13cb59212f279e05c20cb76db62 (diff) | |
| download | Qt-fbe103bd39fcef2b873aae31dcfee9604237a95e.zip Qt-fbe103bd39fcef2b873aae31dcfee9604237a95e.tar.gz Qt-fbe103bd39fcef2b873aae31dcfee9604237a95e.tar.bz2 | |
Revert "Avoids comparing a pointer (d->layout) after deleted in qgraphicswidget"
This reverts commit e181f8754bccb13cb59212f279e05c20cb76db62.
This code is used for compatibility issues for custom layouts that
dont delete their children, so its a false positive from coverity.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index cb8336d..3ea80ce 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -258,6 +258,7 @@ QGraphicsWidget::~QGraphicsWidget() //we check if we have a layout previously if (d->layout) { + delete d->layout; foreach (QGraphicsItem * item, childItems()) { // In case of a custom layout which doesn't remove and delete items, we ensure that // the parent layout item does not point to the deleted layout. This code is here to @@ -268,7 +269,6 @@ QGraphicsWidget::~QGraphicsWidget() widget->setParentLayoutItem(0); } } - delete d->layout; } // Remove this graphics widget from widgetStyles |