diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-26 10:26:42 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-26 11:26:12 (GMT) |
| commit | ff870dbf9106f2bbb2cf64f5aa35fc5917e5f4f2 (patch) | |
| tree | 2430b6a5967ff0b8c2ef7ff4d90e5cdf8c840be4 /src | |
| parent | df0e6759e8ebc1053f951d3a5398a41156e91913 (diff) | |
| download | Qt-ff870dbf9106f2bbb2cf64f5aa35fc5917e5f4f2.zip Qt-ff870dbf9106f2bbb2cf64f5aa35fc5917e5f4f2.tar.gz Qt-ff870dbf9106f2bbb2cf64f5aa35fc5917e5f4f2.tar.bz2 | |
QMetaObject::normalizeType: Fix parsing of type which contains "const" in names
Regression since b881d8fb99972f1bd04ab4c84843cc8d43ddbeed
Task-number: QTBUG-9354
Reviewed-by: Kent Hansen
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetaobject_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 1f4bd2f..b538787 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -287,7 +287,8 @@ static QByteArray normalizeTypeInternal(const char *t, const char *e, bool fixSc } // cv qualifers can appear after the type as well - if (t != e && (e - t >= 5 && strncmp("const", t, 5) == 0)) { + if (!is_ident_char(c) && t != e && (e - t >= 5 && strncmp("const", t, 5) == 0) + && (e - t == 5 || !is_ident_char(t[5]))) { t += 5; while (t != e && is_space(*t)) ++t; |