shiboken/typedatabase: Match multiple type entries by name

For smart pointer instantiations, type entries from multiple modules
need to be searched, which is currently not implemented.

Extend the type database to return all type entries by name. Split out
the code finding a type entry from
AbstractMetaBuilderPrivate::translateType() and change it return a
list.

Ignore duplicate primitive types for now since that cannot be easily
avoided.

Task-number: PYSIDE-1024
Change-Id: I4a30b9151b472acff5fba221019a2e321807d4a0
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

1 files changed, 8 insertions, 2 deletions

diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
index 35bd363b5..647ceb67f 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
@@ -2550,13 +2550,19 @@ void ShibokenGenerator::collectContainerTypesFromConverterMacros(const QString &
     QString convMacro = toPythonMacro ? QLatin1String("%CONVERTTOPYTHON[") : QLatin1String("%CONVERTTOCPP[");
     int offset = toPythonMacro ? sizeof("%CONVERTTOPYTHON") : sizeof("%CONVERTTOCPP");
     int start = 0;
+    QString errorMessage;
     while ((start = code.indexOf(convMacro, start)) != -1) {
         int end = code.indexOf(QLatin1Char(']'), start);
         start += offset;
         if (code.at(start) != QLatin1Char('%')) {
             QString typeString = code.mid(start, end - start);
-            AbstractMetaType *type = buildAbstractMetaTypeFromString(typeString);
-            addInstantiatedContainersAndSmartPointers(type, type->originalTypeDescription());
+            if (AbstractMetaType *type =
+                    buildAbstractMetaTypeFromString(typeString, &errorMessage)) {
+                addInstantiatedContainersAndSmartPointers(type, type->originalTypeDescription());
+            } else {
+                qFatal("%s: Cannot translate type \"%s\": %s", __FUNCTION__,
+                       qPrintable(typeString), qPrintable(errorMessage));
+            }
         }
         start = end;
     }