Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	doc/src/qnamespace.qdoc
	src/corelib/global/qnamespace.h
	src/gui/graphicsview/qgraphicsscene.cpp

1 files changed, 14 insertions, 2 deletions

diff --git a/src/gui/itemviews/qitemeditorfactory.cpp b/src/gui/itemviews/qitemeditorfactory.cpp
index c576e40..480a472 100644
--- a/src/gui/itemviews/qitemeditorfactory.cpp
+++ b/src/gui/itemviews/qitemeditorfactory.cpp
@@ -158,6 +158,10 @@ QByteArray QItemEditorFactory::valuePropertyName(QVariant::Type type) const
 */
 QItemEditorFactory::~QItemEditorFactory()
 {
+    //we make sure we delete all the QItemEditorCreatorBase
+    //this has to be done only once, hence the QSet
+    QSet<QItemEditorCreatorBase*> set = creatorMap.values().toSet();
+    qDeleteAll(set);
 }
 
 /*!
@@ -170,8 +174,16 @@ QItemEditorFactory::~QItemEditorFactory()
 */
 void QItemEditorFactory::registerEditor(QVariant::Type type, QItemEditorCreatorBase *creator)
 {
-   delete creatorMap.value(type, 0);
-   creatorMap[type] = creator;
+    QHash<QVariant::Type, QItemEditorCreatorBase *>::iterator it = creatorMap.find(type);
+    if (it != creatorMap.end()) {
+        QItemEditorCreatorBase *oldCreator = it.value();
+        Q_ASSERT(oldCreator);
+        creatorMap.erase(it);
+        if (!creatorMap.values().contains(oldCreator))
+            delete oldCreator; // if it is no more in use we can delete it
+    }
+
+    creatorMap[type] = creator;
 }
 
 class QDefaultItemEditorFactory : public QItemEditorFactory