shiboken6: Improve message about not being able to resolve typedefs

Pick-to: 6.5
Change-Id: I9605d7992dfd7506c1d6e75c2719d77cfeffe449
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>

3 files changed, 11 insertions, 2 deletions

diff --git a/sources/shiboken6/ApiExtractor/messages.cpp b/sources/shiboken6/ApiExtractor/messages.cpp
index 01fe08819..d1eb0e44a 100644
--- a/sources/shiboken6/ApiExtractor/messages.cpp
+++ b/sources/shiboken6/ApiExtractor/messages.cpp
@@ -867,6 +867,15 @@ QString msgCannotFindSnippet(const QString &file, const QString &snippetLabel)
     return result;
 }
 
+QString msgUnableToResolveTypedef(const QString &sourceType, const QString &sourceName)
+{
+    QString result;
+    QTextStream(&result) << "Unable to resolve typedef \"" << sourceType
+        << "\": Could not find a value, container, object or smart pointer type named \""
+        << sourceName << "\".";
+    return result;
+}
+
 // cppgenerator.cpp
 
 QString msgPureVirtualFunctionRemoved(const AbstractMetaFunction *f)
diff --git a/sources/shiboken6/ApiExtractor/messages.h b/sources/shiboken6/ApiExtractor/messages.h
index 6d12195d1..a0bd94c55 100644
--- a/sources/shiboken6/ApiExtractor/messages.h
+++ b/sources/shiboken6/ApiExtractor/messages.h
@@ -208,6 +208,7 @@ QString msgIncorrectlyNestedName(const QString &name);
 QString msgCannotFindView(const QString &viewedName, const QString &name);
 
 QString msgCannotFindSnippet(const QString &file, const QString &snippetLabel);
+QString msgUnableToResolveTypedef(const QString &sourceType, const QString &sourceName);
 
 QString msgCyclicDependency(const QString &funcName, const QString &graphName,
                             const AbstractMetaFunctionCList &cyclic,
diff --git a/sources/shiboken6/ApiExtractor/typedatabase.cpp b/sources/shiboken6/ApiExtractor/typedatabase.cpp
index 67e6b725b..a2811a5b4 100644
--- a/sources/shiboken6/ApiExtractor/typedatabase.cpp
+++ b/sources/shiboken6/ApiExtractor/typedatabase.cpp
@@ -636,8 +636,7 @@ TypeEntryPtr TypeDatabasePrivate::resolveTypeDefEntry(const TypedefEntryPtr &typ
     }
     if (!source) {
         if (errorMessage)
-            *errorMessage = u"Unable to resolve typedef \""_s
-                            + typedefEntry->sourceType() + u'"';
+            *errorMessage = msgUnableToResolveTypedef(typedefEntry->sourceType(), sourceName);
         return nullptr;
     }