1 files changed, 38 insertions, 2 deletions
diff --git a/sources/shiboken2/ApiExtractor/messages.cpp b/sources/shiboken2/ApiExtractor/messages.cpp
index 0eb3c607f..0e905c9a0 100644
--- a/sources/shiboken2/ApiExtractor/messages.cpp
+++ b/sources/shiboken2/ApiExtractor/messages.cpp
@@ -28,6 +28,7 @@
 
 #include "messages.h"
 #include "abstractmetalang.h"
+#include "typedatabase.h"
 #include "typesystem.h"
 #include <codemodel.h>
 
@@ -152,6 +153,22 @@ QString msgNoEnumTypeConflict(const EnumModelItem &enumItem,
     return result;
 }
 
+QString msgAmbiguousVaryingTypesFound(const QString &qualifiedName, const TypeEntries &te)
+{
+    QString result = QLatin1String("Ambiguous types of varying types found for \"") + qualifiedName
+        + QLatin1String("\": ");
+    QDebug(&result) << te;
+    return result;
+}
+
+QString msgAmbiguousTypesFound(const QString &qualifiedName, const TypeEntries &te)
+{
+    QString result = QLatin1String("Ambiguous types found for \"") + qualifiedName
+        + QLatin1String("\": ");
+    QDebug(&result) << te;
+    return result;
+}
+
 QString msgUnmatchedParameterType(const ArgumentModelItem &arg, int n,
                                   const QString &why)
 {
@@ -218,6 +235,23 @@ QString msgCannotFindTypeEntry(const QString &t)
     return QLatin1String("Cannot find type entry for \"") + t + QLatin1String("\".");
 }
 
+QString msgCannotFindTypeEntryForSmartPointer(const QString &t, const QString &smartPointerType)
+{
+    return QLatin1String("Cannot find type entry \"") + t
+        + QLatin1String("\" for instantiation of \"") + smartPointerType + QLatin1String("\".");
+}
+
+QString msgInvalidSmartPointerType(const TypeInfo &i)
+{
+    return QLatin1String("Invalid smart pointer type \"") + i.toString() + QLatin1String("\".");
+}
+
+QString msgCannotFindSmartPointerInstantion(const TypeInfo &i)
+{
+    return QLatin1String("Cannot find instantiation of smart pointer type for \"")
+        + i.toString() + QLatin1String("\".");
+}
+
 QString msgCannotTranslateTemplateArgument(int i,
                                            const TypeInfo &typeInfo,
                                            const QString &why)
@@ -356,8 +390,10 @@ QString msgCannotFindSmartPointer(const QString &instantiationType,
     QString result;
     QTextStream str(&result);
     str << "Unable to find smart pointer type for " << instantiationType << " (known types:";
-    for (auto t : pointers)
-        str << ' ' << t->fullName();
+    for (auto t : pointers) {
+        auto typeEntry = t->typeEntry();
+        str << ' ' << typeEntry->targetLangName() << '/' << typeEntry->qualifiedCppName();
+    }
     str << ").";
     return result;
 }