diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-26 08:31:19 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-26 08:31:19 (GMT) |
| commit | b914c388a809c17e4f76a4dcc1d3a1006e13c115 (patch) | |
| tree | ef6723688578c7ff13fed8b4ea0c961aaf98fe09 /src/corelib | |
| parent | 7278c142089d46946d1ad2558eae949220dfe0c4 (diff) | |
| parent | d553f376a34ea1d27492a1a5fd14f79616f6a27c (diff) | |
| download | Qt-b914c388a809c17e4f76a4dcc1d3a1006e13c115.zip Qt-b914c388a809c17e4f76a4dcc1d3a1006e13c115.tar.gz Qt-b914c388a809c17e4f76a4dcc1d3a1006e13c115.tar.bz2 | |
Merge branch '4.5'
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/network/access/qnetworkreplyimpl.cpp
Diffstat (limited to 'src/corelib')
| -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 }; |