summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qobject.cpp
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2014-09-15 19:37:05 +0200
committerDaniel Teske <daniel.teske@digia.com>2014-09-30 15:24:36 +0200
commited3fc4ea474c751c891c76279db5e14c048033ca (patch)
tree929070ecf7549a8b999f5e50ba46a178332e038a /src/corelib/kernel/qobject.cpp
parent189dc655bbb3b4f9e1e11596f5a0f4682326066d (diff)
QObject: Actually check unnormalized method signature
This was broken in f95181c7bb340744a0ce172e8c5a8fcdc2543297, and has been broken in all released versions of Qt5. Change-Id: Ia75ab602be4904cc6ab19471f909716538af8746 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
-rw-r--r--src/corelib/kernel/qobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 65b22021fd..4cf957089f 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2658,8 +2658,8 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const char *sign
const char *method_arg = method;
++method; // skip code
- QByteArray methodName;
QArgumentTypeArray methodTypes;
+ QByteArray methodName = QMetaObjectPrivate::decodeMethodSignature(method, methodTypes);
const QMetaObject *rmeta = receiver->metaObject();
int method_index_relative = -1;
Q_ASSERT(QMetaObjectPrivate::get(rmeta)->revision >= 7);