From a3ef1b5e0d8e7181793db07ba3a2fe1546c952ac Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Thu, 18 Mar 2010 10:56:00 +0100
Subject: fix a crash when registering 2 metatype name for the same actual type
 Reviewed-by: ogoffart

---
 src/corelib/kernel/qmetatype.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 30af6fa..ce9ed58 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -518,19 +518,15 @@ int QMetaType::registerTypedef(const char* typeName, int aliasId)
     idx = qMetaTypeCustomType_unlocked(normalizedTypeName.constData(),
                                            normalizedTypeName.size());
 
-    if (idx) {
-        Q_ASSERT(idx == aliasId);
+    if (idx)
         return idx;
-    }
 
-    if (!idx) {
-        QCustomTypeInfo inf;
-        inf.typeName = normalizedTypeName;
-        inf.alias = aliasId;
-        inf.constr = 0;
-        inf.destr = 0;
-        ct->append(inf);
-    }
+    QCustomTypeInfo inf;
+    inf.typeName = normalizedTypeName;
+    inf.alias = aliasId;
+    inf.constr = 0;
+    inf.destr = 0;
+    ct->append(inf);
     return aliasId;
 }
 
-- 
cgit v0.12