shiboken6: Fix passing QFlags by const-ref

The type resolution code searched the result of TypeInfo::toString()
in the type database, which may contain qualifications like
"const Foo &".

To fix this, add a function returning the name with instantiations
only and use that. As a drive-by, add a convenvience function
returning the qualified name as a string and simplify the code
accordingly.

Pick-to: 6.9
Change-Id: I071e8dc3f65257e300007d53688c442a683813e1
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>

3 files changed, 34 insertions, 19 deletions

diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
index 27570ec4f..5120ca7b1 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
@@ -2664,7 +2664,7 @@ std::optional<AbstractMetaType>
         qsizetype i = d ? d->m_scopes.size() - 1 : -1;
         while (i >= 0) {
             typeInfo = TypeInfo::resolveType(_typei, d->m_scopes.at(i--));
-            if (typeInfo.qualifiedName().join(u"::"_s) != _typei.qualifiedName().join(u"::"_s))
+            if (typeInfo.qualifiedName() != _typei.qualifiedName())
                 break;
         }
 
@@ -2757,7 +2757,7 @@ std::optional<AbstractMetaType>
 
     // 4. Special case QFlags (include instantiation in name)
     if (qualifiedName == u"QFlags") {
-        qualifiedName = typeInfo.toString();
+        qualifiedName = typeInfo.qualifiedInstantationName();
         typeInfo.clearInstantiations();
     }
 
@@ -2796,7 +2796,7 @@ std::optional<AbstractMetaType>
         // For non-type template parameters, create a dummy type entry on the fly
         // as is done for classes.
         if (!targType.has_value()) {
-            const QString value = ti.qualifiedName().join(u"::"_s);
+            const QString value = ti.qualifiedNameString();
             if (isNumber(value)) {
                 auto module = typeSystemTypeEntry(type);
                 TypeDatabase::instance()->addConstantValueTypeEntry(value, module);
@@ -3082,7 +3082,7 @@ AbstractMetaClassPtr
         QString prefix = i > 0 ? QStringList(scope.mid(0, i)).join(u"::"_s) + u"::"_s : QString();
         QString completeName = prefix + name;
         const TypeInfo parsed = TypeParser::parse(completeName, &errorMessage);
-        QString qualifiedName = parsed.qualifiedName().join(u"::"_s);
+        QString qualifiedName = parsed.qualifiedNameString();
         if (qualifiedName.isEmpty()) {
             qWarning().noquote().nospace() << "Unable to parse type \"" << completeName
                 << "\" while looking for template \"" << name << "\": " << errorMessage;
@@ -3196,7 +3196,7 @@ static std::optional<AbstractMetaType>
                              const AbstractMetaClassCPtr &templateClass,
                              const TypeInfo &info, QString *errorMessage)
 {
-    QString typeName = info.qualifiedName().join("::"_L1);
+    QString typeName = info.qualifiedNameString();
     TypeDatabase *typeDb = TypeDatabase::instance();
     TypeEntryPtr t;
     // Check for a non-type template integer parameter, that is, for a base
diff --git a/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp b/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp
index 845a0f916..93627e6d5 100644
--- a/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp
+++ b/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp
@@ -110,6 +110,28 @@ QStringList TypeInfo::qualifiedName() const
     return d->m_qualifiedName;
 }
 
+QString TypeInfo::qualifiedNameString() const
+{
+    return d->m_qualifiedName.join("::"_L1);
+}
+
+QString TypeInfo::qualifiedInstantationName() const
+{
+    QString result = qualifiedNameString();
+    if (const auto instantiationCount = d->m_instantiations.size()) {
+        result += u'<';
+        for (qsizetype i = 0; i < instantiationCount; ++i) {
+            if (i)
+                result += ", "_L1;
+            result += d->m_instantiations.at(i).toString();
+        }
+        if (result.endsWith(u'>'))
+            result += u' ';
+        result += u'>';
+    }
+    return result;
+}
+
 void TypeInfo::setQualifiedName(const QStringList &qualified_name)
 {
     if (d->m_qualifiedName != qualified_name)
@@ -300,7 +322,7 @@ TypeInfo TypeInfo::resolveType(const CodeModelItem &__item, TypeInfo const &__ty
         // typedef struct xcb_connection_t xcb_connection_t;
         if (nextItem.get() ==__item.get()) {
             std::cerr << "** WARNING Bailing out recursion of " << __FUNCTION__
-                << "() on " << qPrintable(__type.qualifiedName().join(u"::"_s))
+                << "() on " << qPrintable(__type.qualifiedNameString())
                 << '\n';
             return otherType;
         }
@@ -385,19 +407,7 @@ QString TypeInfo::toString() const
     if (isVolatile())
         tmp += u"volatile "_s;
 
-    tmp += d->m_qualifiedName.join(u"::"_s);
-
-    if (const auto instantiationCount = d->m_instantiations.size()) {
-        tmp += u'<';
-        for (qsizetype i = 0; i < instantiationCount; ++i) {
-            if (i)
-                tmp += u", "_s;
-            tmp += d->m_instantiations.at(i).toString();
-        }
-        if (tmp.endsWith(u'>'))
-            tmp += u' ';
-        tmp += u'>';
-    }
+    tmp += qualifiedInstantationName();
 
     for (Indirection i : d->m_indirections)
         tmp.append(indirectionKeyword(i));
diff --git a/sources/shiboken6/ApiExtractor/parser/typeinfo.h b/sources/shiboken6/ApiExtractor/parser/typeinfo.h
index 9cd746e85..6f75b5737 100644
--- a/sources/shiboken6/ApiExtractor/parser/typeinfo.h
+++ b/sources/shiboken6/ApiExtractor/parser/typeinfo.h
@@ -39,6 +39,11 @@ public:
 
     QStringList qualifiedName() const;
     void setQualifiedName(const QStringList &qualified_name);
+    // Returns "std::list"
+    QString qualifiedNameString() const;
+    // Returns qualifiedName() with instantions ("std::list<int>")
+    QString qualifiedInstantationName() const;
+
     void addName(const QString &);
 
     bool isVoid() const;