qmltyperegistrar: Strip '*' from method return types

Method return types should look the same as other types. Also, recognize
that method return types could be lists and add a TODO to this effect.

Pick-to: 6.2
Fixes: QTBUG-96587
Change-Id: I94bbc347fc47eba8f09dc40a9163cfe78aec4b94
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>

2 files changed, 17 insertions, 0 deletions

diff --git a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp
index 6d6dcd0895..ef642ed984 100644
--- a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp
+++ b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp
@@ -326,4 +326,11 @@ void tst_qmltyperegistrar::derivedFromForeignPrivate()
     QVERIFY(qmltypesData.contains("file: \"private/foreign_p.h\""));
 }
 
+void tst_qmltyperegistrar::methodReturnType()
+{
+    QVERIFY(qmltypesData.contains("createAThing"));
+    QVERIFY(!qmltypesData.contains("QQmlComponent*"));
+    QVERIFY(qmltypesData.contains("type: \"QQmlComponent\""));
+}
+
 QTEST_MAIN(tst_qmltyperegistrar)
diff --git a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.h b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.h
index e144c26499..62f22af420 100644
--- a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.h
+++ b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.h
@@ -33,6 +33,7 @@
 #include "foreign_p.h"
 
 #include <QtQml/qqml.h>
+#include <QtQml/qqmlcomponent.h>
 #include <QtCore/qproperty.h>
 #include <QtCore/qtimeline.h>
 #include <QtCore/qrect.h>
@@ -431,6 +432,14 @@ class DerivedFromForeignPrivate : public ForeignPrivate
     QML_ELEMENT
 };
 
+class WithMethod : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+public:
+    Q_INVOKABLE QQmlComponent *createAThing(int) { return nullptr; }
+};
+
 class tst_qmltyperegistrar : public QObject
 {
     Q_OBJECT
@@ -463,6 +472,7 @@ private slots:
     void namespaceExtendedNamespace();
     void deferredNames();
     void derivedFromForeignPrivate();
+    void methodReturnType();
 
 private:
     QByteArray qmltypesData;