diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-15 15:54:27 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-15 15:54:27 (GMT) |
| commit | 88fa17f5664e3839ffc04db1315e8d9d07f8b956 (patch) | |
| tree | 65c63c815a169ffcb02fa3a3bdb63d2e2d9ba4cb /src/gui/graphicsview/qgraphicsitem.cpp | |
| parent | 8d7046fbd798c6104eca6098b828c505ca32085c (diff) | |
| parent | 925c41f2a1c38d958de3844785bcc8c83ff74004 (diff) | |
| download | Qt-88fa17f5664e3839ffc04db1315e8d9d07f8b956.zip Qt-88fa17f5664e3839ffc04db1315e8d9d07f8b956.tar.gz Qt-88fa17f5664e3839ffc04db1315e8d9d07f8b956.tar.bz2 | |
Merge branch 'qt-graphics-team-qstatictext-4.7'
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index b4e19d1..39c41c4 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1392,7 +1392,8 @@ QGraphicsItem::~QGraphicsItem() } delete d_ptr->transformData; - qt_dataStore()->data.remove(this); + if (QGraphicsItemCustomDataStore *dataStore = qt_dataStore()) + dataStore->data.remove(this); } /*! |