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/tools/moc | |
| 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/tools/moc')
| -rw-r--r-- | src/tools/moc/generator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 563310d..b872dfd 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -928,7 +928,7 @@ void Generator::generateStaticMetacall(const QByteArray &prefix) fprintf(out, " switch (_id) {\n"); for (int ctorindex = 0; ctorindex < cdef->constructorList.count(); ++ctorindex) { fprintf(out, " case %d: { %s *_r = new %s(", ctorindex, - cdef->classname.constData(), cdef->classname.constData()); + cdef->qualified.constData(), cdef->qualified.constData()); const FunctionDef &f = cdef->constructorList.at(ctorindex); int offset = 1; for (int j = 0; j < f.arguments.count(); ++j) { @@ -946,7 +946,7 @@ void Generator::generateStaticMetacall(const QByteArray &prefix) fprintf(out, " }\n"); if (!isQObject) - fprintf(out, " _id = %s::staticMetaObject.superClass()->static_metacall(_c, _id, _a);\n", cdef->classname.constData()); + fprintf(out, " _id = %s::staticMetaObject.superClass()->static_metacall(_c, _id, _a);\n", cdef->qualified.constData()); fprintf(out, " if (_id < 0)\n return _id;\n"); |