diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-12 07:10:59 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-08-12 07:10:59 (GMT) |
| commit | 81529d52a76b48aa89b7ac8c9044da4ea5c11f3f (patch) | |
| tree | 15804758bc6d213044fcacd8d00c88d8321ed1c9 /src/corelib/kernel/qmetaobject.cpp | |
| parent | 03d9d3cf641c8dde22a903870ac2b6e58ada6eec (diff) | |
| parent | 773512d205df2ba7caa28b7b5cdbfbd6787a0967 (diff) | |
| download | Qt-81529d52a76b48aa89b7ac8c9044da4ea5c11f3f.zip Qt-81529d52a76b48aa89b7ac8c9044da4ea5c11f3f.tar.gz Qt-81529d52a76b48aa89b7ac8c9044da4ea5c11f3f.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 79a38cd..9854e68 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -1009,8 +1009,11 @@ QByteArray QMetaObject::normalizedSignature(const char *method) int argdepth = 0; int templdepth = 0; while (*d) { - if (argdepth == 1) + if (argdepth == 1) { d = qNormalizeType(d, templdepth, result); + if (!*d) //most likely an invalid signature. + break; + } if (*d == '(') ++argdepth; if (*d == ')') |