diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-28 09:58:16 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-28 09:58:16 (GMT) |
| commit | 42fdaf078b9332e13d260df00359e8adc8522872 (patch) | |
| tree | 6a1d7b675b788372720e928e4e2aba77bfcad552 /src/gui/graphicsview/qgraphicsitem.cpp | |
| parent | 262d0df3b166fecb3502e81b2ab85cadd71ae70f (diff) | |
| parent | a925ba1ab6316a155f2ac61f898c52f07a1340b4 (diff) | |
| download | Qt-42fdaf078b9332e13d260df00359e8adc8522872.zip Qt-42fdaf078b9332e13d260df00359e8adc8522872.tar.gz Qt-42fdaf078b9332e13d260df00359e8adc8522872.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index c38365b..0107fba 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1286,6 +1286,8 @@ QGraphicsItem::QGraphicsItem(QGraphicsItemPrivate &dd, QGraphicsItem *parent, */ QGraphicsItem::~QGraphicsItem() { + if (d_ptr->isObject) + QObjectPrivate::get(static_cast<QGraphicsObject *>(this))->wasDeleted = true; d_ptr->inDestructor = 1; d_ptr->removeExtraItemCache(); |