Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

1 files changed, 7 insertions, 2 deletions

diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 4dc766ecc5..8d6cf5beb5 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -42,6 +42,7 @@
 #include "qmetaobject.h"
 #include "qmetatype.h"
 #include "qobject.h"
+#include "qmetaobject_p.h"
 
 #include <qcoreapplication.h>
 #include <qcoreevent.h>
@@ -2098,8 +2099,12 @@ bool QMetaMethod::invoke(QObject *object,
         if (qstrcmp(returnValue.name(), retType) != 0) {
             // normalize the return value as well
             QByteArray normalized = QMetaObject::normalizedType(returnValue.name());
-            if (qstrcmp(normalized.constData(), retType) != 0)
-                return false;
+            if (qstrcmp(normalized.constData(), retType) != 0) {
+                // String comparison failed, try compare the metatype.
+                int t = returnType();
+                if (t == QMetaType::UnknownType || t != QMetaType::type(normalized))
+                    return false;
+            }
         }
     }