From fa987d44417528856d5e80ed7b48ba99e19fa307 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Thu, 19 Mar 2020 10:47:29 +0100 Subject: MetaObject: Store the QMetaType of the methods This does the analog of 46f407126ef3e94d59254012cdc34d6a4ad2faf2 for the methods we care about (signals, slots, Q_INVOKABLEs). In addition to the actual QMetaType, we store an array with offsets so that we later can do a mapping from methodIndex to metatype. The newly added QMetaMethod::{return,parameter}MetaType methods can then be used to retrieve the metatypes. This does however require that all involved types are complete. This is unfortunately not a feasible requirement. Thus, we only populate the metatype array on a best effort basis. For any incomplete type, we store QMetaType::Unknown. Then, when accessing the metatype, we fall back to the old string based code base if it's Unknown. Squashes "moc: support incomplete types" and "Fix compile failures after QMetaMethod change" Fixes: QTBUG-82932 Change-Id: I6b7a587cc364b7cad0c158d6de54e8a204289ad4 Reviewed-by: Lars Knoll --- src/tools/moc/main.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/tools/moc/main.cpp') diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp index b8c2d7f594..61f3666b16 100644 --- a/src/tools/moc/main.cpp +++ b/src/tools/moc/main.cpp @@ -367,6 +367,10 @@ int runMoc(int argc, char **argv) depFileRuleNameOption.setValueName(QStringLiteral("rule name")); parser.addOption(depFileRuleNameOption); + QCommandLineOption requireCompleTypesOption(QStringLiteral("require-complete-types")); + requireCompleTypesOption.setDescription(QStringLiteral("Require complete types for better performance")); + parser.addOption(requireCompleTypesOption); + parser.addPositionalArgument(QStringLiteral("[header-file]"), QStringLiteral("Header file to read from, otherwise stdin.")); parser.addPositionalArgument(QStringLiteral("[@option-file]"), @@ -398,6 +402,8 @@ int runMoc(int argc, char **argv) moc.noInclude = true; autoInclude = false; } + if (parser.isSet(requireCompleTypesOption)) + moc.requireCompleteTypes = true; if (!ignoreConflictingOptions) { if (parser.isSet(forceIncludeOption)) { moc.noInclude = false; -- cgit v1.2.3