diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 12:32:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 12:32:48 (GMT) |
| commit | 466ac1c7d93d3f5dea35f1a6e214907899772ae3 (patch) | |
| tree | 8253e96351c5620e390a2d68fdb1520e2f2725bd /src/gui | |
| parent | c2d213becf8f96257789ebeb3ab074733da36424 (diff) | |
| parent | 7724c474a941ea3516da6102a16b30ca254afe53 (diff) | |
| download | Qt-466ac1c7d93d3f5dea35f1a6e214907899772ae3.zip Qt-466ac1c7d93d3f5dea35f1a6e214907899772ae3.tar.gz Qt-466ac1c7d93d3f5dea35f1a6e214907899772ae3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
Diffstat (limited to 'src/gui')
| -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); } /*! |