Merge remote branch 'origin/4.7' into oslo-staging-1

Conflicts:
	mkspecs/common/symbian/symbian.conf

2 files changed, 8 insertions, 12 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;
 }
 
diff --git a/src/corelib/kernel/qsystemsemaphore_symbian.cpp b/src/corelib/kernel/qsystemsemaphore_symbian.cpp
index c252dd5..8cef611 100644
--- a/src/corelib/kernel/qsystemsemaphore_symbian.cpp
+++ b/src/corelib/kernel/qsystemsemaphore_symbian.cpp
@@ -44,7 +44,7 @@
 #include "qcoreapplication.h"
 #include <qdebug.h>
 
-#include <qcore_symbian_p.h>
+#include "qcore_symbian_p.h"
 #include <e32cmn.h>
 QT_BEGIN_NAMESPACE