diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-29 09:01:48 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-31 14:32:45 (GMT) |
| commit | a1a141e4af6226dca9ae67c51dd5e14cb3393772 (patch) | |
| tree | 6b4ba52827c25f6bd06ea5b2b7b067968c634cc9 /src/tools/moc | |
| parent | bc3491c1b85ca36486c9472ecf7ba82f46699e8a (diff) | |
| download | Qt-a1a141e4af6226dca9ae67c51dd5e14cb3393772.zip Qt-a1a141e4af6226dca9ae67c51dd5e14cb3393772.tar.gz Qt-a1a141e4af6226dca9ae67c51dd5e14cb3393772.tar.bz2 | |
moc: be able to compile if there are private classes
Reviewed-by: brad
Reviewed-by: thiago
Diffstat (limited to 'src/tools/moc')
| -rw-r--r-- | src/tools/moc/generator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index ac769d7..67aba8f 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -330,15 +330,15 @@ void Generator::generateCode() bool hasExtraData = (cdef->hasQObject && !isQt) || !extraList.isEmpty(); if (hasExtraData) { - fprintf(out, "static const QMetaObjectExtraData qt_meta_extradata2_%s = {\n ", - qualifiedClassNameIdentifier.constData()); + fprintf(out, "const QMetaObjectExtraData %s::staticMetaObjectExtraData = {\n ", + cdef->qualified.constData()); if (extraList.isEmpty()) fprintf(out, "0, "); else fprintf(out, "qt_meta_extradata_%s, ", qualifiedClassNameIdentifier.constData()); if (cdef->hasQObject && !isQt) - fprintf(out, " %s::qt_static_metacall", cdef->qualified.constData()); + fprintf(out, " qt_static_metacall"); else fprintf(out, " 0"); fprintf(out, " \n};\n\n"); @@ -363,7 +363,7 @@ void Generator::generateCode() if (!hasExtraData) fprintf(out, "0 }\n"); else - fprintf(out, "&qt_meta_extradata2_%s }\n", qualifiedClassNameIdentifier.constData()); + fprintf(out, "&staticMetaObjectExtraData }\n"); fprintf(out, "};\n"); if(isQt) |