shiboken2: Ensure there are no AbstractMetaType with Invalid usage

Introduce new values for the pattern enum representing
template parameters, which were previously invalid and add
a missing call to decideUsagePattern().

Change-Id: I7edeb80a67ab1edfe895e96311d54c9128fad5a3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

1 files changed, 4 insertions, 2 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 8ef2866c2..15710de4c 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -1981,14 +1981,13 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction:
 {
     Q_ASSERT(!typeInfo.name.isEmpty());
     TypeDatabase* typeDb = TypeDatabase::instance();
-    TypeEntry* type;
 
     QString typeName = typeInfo.name;
 
     if (typeName == QLatin1String("void"))
         return AbstractMetaType::createVoid();
 
-    type = typeDb->findType(typeName);
+    TypeEntry *type = typeDb->findType(typeName);
     if (!type)
         type = typeDb->findFlagsType(typeName);
 
@@ -2049,6 +2048,8 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction:
             metaType->addInstantiation(metaArgType);
         }
         metaType->setTypeUsagePattern(AbstractMetaType::ContainerPattern);
+    } else {
+        metaType->decideUsagePattern();
     }
 
     return metaType;
@@ -2369,6 +2370,7 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateTypeStatic(const TypeInfo
         }
     }
 
+    Q_ASSERT(metaType->typeUsagePattern() != AbstractMetaType::InvalidPattern);
     return metaType.take();
 }