diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-09 12:32:30 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-10 11:24:19 +0200 |
| commit | ace19063cbb02eb0dc05d2c7f1dcb9a9207c7702 (patch) | |
| tree | 45ebb8c9f097c53d053135238748d937a9dc03d1 /src/tools/moc/generator.cpp | |
| parent | a8caae37ef21e06512364f513e930f2bafd543e8 (diff) | |
Moc: Require complete types consistently
If we require complete types when generating the list of metatypes, then
we also need to require them when generating each entry, and vice versa.
Change-Id: I68394f8628bb6cd89f77bb829b1d4b5ab35071a0
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
Diffstat (limited to 'src/tools/moc/generator.cpp')
| -rw-r--r-- | src/tools/moc/generator.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 0df3a43584..1fe366dde4 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -572,7 +572,8 @@ void Generator::generateCode() fprintf(out, " nullptr,\n"); } else { bool needsComma = false; - if (!(requireCompleteTypes || cdef->requireCompleteMethodTypes)) { + const bool requireCompleteness = requireCompleteTypes || cdef->requireCompleteMethodTypes; + if (!requireCompleteness) { fprintf(out, "qt_incomplete_metaTypeArray<qt_meta_stringdata_%s_t\n", qualifiedClassNameIdentifier.constData()); needsComma = true; } else { @@ -580,7 +581,7 @@ void Generator::generateCode() } for (int i = 0; i < cdef->propertyList.count(); ++i) { const PropertyDef &p = cdef->propertyList.at(i); - if (requireCompleteTypes) + if (requireCompleteness) fprintf(out, "%s%s", needsComma ? ", " : "", p.type.data()); else fprintf(out, "%sQtPrivate::TypeAndForceComplete<%s, std::true_type>", needsComma ? ", " : "", p.type.data()); @@ -590,13 +591,13 @@ void Generator::generateCode() { cdef->signalList, cdef->slotList, cdef->methodList }) { for (int i = 0; i< methodContainer.count(); ++i) { const FunctionDef& fdef = methodContainer.at(i); - if (requireCompleteTypes) + if (requireCompleteness) fprintf(out, "%s%s", needsComma ? ", " : "", fdef.type.name.data()); else fprintf(out, "%sQtPrivate::TypeAndForceComplete<%s, std::false_type>", needsComma ? ", " : "", fdef.type.name.data()); needsComma = true; for (const auto &argument: fdef.arguments) { - if (requireCompleteTypes) + if (requireCompleteness) fprintf(out, ", %s", argument.type.name.data()); else fprintf(out, ", QtPrivate::TypeAndForceComplete<%s, std::false_type>", argument.type.name.data()); @@ -607,7 +608,7 @@ void Generator::generateCode() for (int i = 0; i< cdef->constructorList.count(); ++i) { const FunctionDef& fdef = cdef->constructorList.at(i); for (const auto &argument: fdef.arguments) { - if (requireCompleteTypes) + if (requireCompleteness) fprintf(out, "%s%s", needsComma ? ", " : "", argument.type.name.data()); else fprintf(out, "%sQtPrivate::TypeAndForceComplete<%s, std::false_type>", needsComma ? ", " : "", argument.type.name.data()); |