From 69d239ef00c57baf5af5c760bfedd5344d1d0090 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Sat, 29 Aug 2020 12:07:26 +0200 Subject: Enforce complete method types of QML registered classes For QML, we like to avoid doing string to type lookups at runtime as much as possible. Therefore, QML registration macros like QML_ELEMENT now cause moc to require complete types not only for properties, but also for all methods known to the metatype system. Change-Id: Ied3d940c102719db4852d3a748d05be1f415b353 Reviewed-by: Ulf Hermann Reviewed-by: Qt CI Bot --- src/tools/moc/moc.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/tools/moc/moc.cpp') diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 516b231cd5..228a21e3c2 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -1512,12 +1512,15 @@ void Moc::parseFlag(BaseDef *def) next(RPAREN); } -void Moc::parseClassInfo(BaseDef *def) +Moc::EncounteredQmlMacro Moc::parseClassInfo(BaseDef *def) { + bool encounteredQmlMacro = false; next(LPAREN); ClassInfoDef infoDef; next(STRING_LITERAL); infoDef.name = symbol().unquotedLexem(); + if (infoDef.name.startsWith("QML.")) + encounteredQmlMacro = true; next(COMMA); if (test(STRING_LITERAL)) { infoDef.value = symbol().unquotedLexem(); @@ -1533,6 +1536,13 @@ void Moc::parseClassInfo(BaseDef *def) } next(RPAREN); def->classInfoList += infoDef; + return encounteredQmlMacro ? EncounteredQmlMacro::Yes : EncounteredQmlMacro::No; +} + +void Moc::parseClassInfo(ClassDef *def) +{ + if (parseClassInfo(static_cast(def)) == EncounteredQmlMacro::Yes) + def->requireCompleteMethodTypes = true; } void Moc::parseInterfaces(ClassDef *def) -- cgit v1.2.3