diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-10 14:16:17 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-10 14:16:17 (GMT) |
| commit | 727ec8c564a3947784bfe371b39615f965d530ec (patch) | |
| tree | d4360972a21f8d24214b7a0c5ec7277391479192 /src/corelib/kernel/qmetaobject.cpp | |
| parent | ef9e7168a8ed3e8149204cf6c604a38db35245c0 (diff) | |
| parent | 01a045084ad45da37e6b79938354c82419c0a83e (diff) | |
| download | Qt-727ec8c564a3947784bfe371b39615f965d530ec.zip Qt-727ec8c564a3947784bfe371b39615f965d530ec.tar.gz Qt-727ec8c564a3947784bfe371b39615f965d530ec.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index ecffe99..312c4b2 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -974,7 +974,7 @@ QByteArray QMetaObject::normalizedType(const char *type) if (!type || !*type) return result; - QVarLengthArray<char> stackbuf(int(strlen(type)) + 1); + QVarLengthArray<char> stackbuf(qstrlen(type) + 1); qRemoveWhitespace(type, stackbuf.data()); int templdepth = 0; qNormalizeType(stackbuf.data(), templdepth, result); |