diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-26 08:32:37 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-26 08:32:37 (GMT) |
| commit | 386c9f0cc7234169dd128aa0b54be99fa38ef694 (patch) | |
| tree | e5d043f8f652a857ad83fbfb4bc38da16a8b5fc4 /src/corelib/kernel | |
| parent | e9e2baccfcfc48926414b0f18885140312470cae (diff) | |
| parent | b914c388a809c17e4f76a4dcc1d3a1006e13c115 (diff) | |
| download | Qt-386c9f0cc7234169dd128aa0b54be99fa38ef694.zip Qt-386c9f0cc7234169dd128aa0b54be99fa38ef694.tar.gz Qt-386c9f0cc7234169dd128aa0b54be99fa38ef694.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 260be26..215f6ae 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -218,8 +218,14 @@ QObject *QMetaObject::newInstance(QGenericArgument val0, QGenericArgument val8, QGenericArgument val9) const { + QByteArray constructorName = className(); + { + int idx = constructorName.lastIndexOf(':'); + if (idx != -1) + constructorName.remove(0, idx+1); // remove qualified part + } QVarLengthArray<char, 512> sig; - sig.append(className(), qstrlen(className())); + sig.append(constructorName.constData(), constructorName.length()); sig.append('('); enum { MaximumParamCount = 10 }; |