Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I8831b840fa7816b8919ecbaab17b41822a0a6012

1 files changed, 30 insertions, 11 deletions

diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index 434b03dc7..11a6c193e 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -1622,20 +1622,39 @@ void CppGenerator::writeConverterRegister(QTextStream &s, const AbstractMetaClas
 
     s << Qt::endl;
 
-    QStringList cppSignature;
-    if (!classContext.forSmartPointer()) {
-        cppSignature = metaClass->qualifiedCppName().split(QLatin1String("::"),
-                                                                       Qt::SkipEmptyParts);
-    } else {
-        cppSignature = classContext.preciseType()->cppSignature().split(QLatin1String("::"),
-                                                                        Qt::SkipEmptyParts);
-    }
-    while (!cppSignature.isEmpty()) {
-        QString signature = cppSignature.join(QLatin1String("::"));
+    auto writeConversions = [&s, this](const QString &signature)
+    {
         s << INDENT << "Shiboken::Conversions::registerConverterName(converter, \"" << signature << "\");\n";
         s << INDENT << "Shiboken::Conversions::registerConverterName(converter, \"" << signature << "*\");\n";
         s << INDENT << "Shiboken::Conversions::registerConverterName(converter, \"" << signature << "&\");\n";
-        cppSignature.removeFirst();
+    };
+
+    auto writeConversionsForType = [writeConversions](const QString &fullTypeName)
+    {
+        QStringList lst = fullTypeName.split(QLatin1String("::"),
+                                               Qt::SkipEmptyParts);
+        while (!lst.isEmpty()) {
+            QString signature = lst.join(QLatin1String("::"));
+            writeConversions(signature);
+            lst.removeFirst();
+        }
+    };
+
+    if (!classContext.forSmartPointer()) {
+        writeConversionsForType(metaClass->qualifiedCppName());
+    } else {
+        const QString &smartPointerType = classContext.preciseType()->instantiations().at(0)->cppSignature();
+        const QString &smartPointerName = classContext.preciseType()->typeEntry()->name();
+
+        QStringList lst = smartPointerType.split(QLatin1String("::"),
+                                               Qt::SkipEmptyParts);
+        while (!lst.isEmpty()) {
+            QString signature = lst.join(QLatin1String("::"));
+            writeConversions(QStringLiteral("%1<%2>").arg(smartPointerName, signature));
+            lst.removeFirst();
+        }
+
+        writeConversionsForType(smartPointerType);
     }
 
     s << INDENT << "Shiboken::Conversions::registerConverterName(converter, typeid(::";