Fix metatype registration of signal-slot params of type QList/QMap/QHash

When declaring signals/slots that take QList/QMap/QHash parameters, we
register metatypes for them. However, we don't always register metatypes
for the parameter types of those containers. In particular, if a
parameter is declared as a POD type in a separate .rep file, metatype
registration for it is skipped.

Fixed the code generation for metatype registration for signal-slot
parameters of type QList/QMap/QHash to also register metatypes for the
contained types if required.

Pick-to: 6.2
Fixes: QTBUG-97704
Change-Id: Ic81895815c380e841c04f2d1400fc2c2cf0e3814
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/tools/repc/repcodegenerator.cpp b/tools/repc/repcodegenerator.cpp
index 175ac43..e3b9ad3 100644
--- a/tools/repc/repcodegenerator.cpp
+++ b/tools/repc/repcodegenerator.cpp
@@ -205,6 +205,21 @@ void RepCodeGenerator::generate(Mode mode, QString fileName)
             pendingMetaTypes << function.returnType;
             for (const ASTDeclaration &decl : function.params) {
                 classMetaTypes << decl.type;
+
+                // Collect types packaged by Qt containers, to register their metatypes if needed
+                QRegularExpression re(
+                        QStringLiteral("(QList|QMap|QHash)<\\s*([\\w]+)\\s*(,\\s*([\\w]+))?\\s*>"));
+                QRegularExpressionMatch m = re.match(decl.type);
+                if (m.hasMatch()) {
+                    if (auto captured = m.captured(2);
+                        !captured.isNull() && !metaTypes.contains(captured)) {
+                        classMetaTypes << captured;
+                    }
+                    if (auto captured = m.captured(4);
+                        !captured.isNull() && !metaTypes.contains(captured)) {
+                        classMetaTypes << captured;
+                    }
+                }
             }
         };
         for (const ASTFunction &function : astClass.signalsList)