diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-20 19:59:06 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-20 19:59:29 +0200 |
| commit | e8d90a9e62898d3b746772d9ae8542b87efcecf8 (patch) | |
| tree | f4ad1e6906f5a9ea805b677d6d878204b64e85e3 /sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | |
| parent | f1bcf7d077282f9248aee570545765ef60af00e3 (diff) | |
| parent | a14ea7738f493280f5c7b6e4a8834a7d1daacd1e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iaabea628351fac9da88b5779b537f62262ff82a7
Diffstat (limited to 'sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp index c8b9c173b..be285693e 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp @@ -1988,14 +1988,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); @@ -2056,6 +2055,8 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction: metaType->addInstantiation(metaArgType); } metaType->setTypeUsagePattern(AbstractMetaType::ContainerPattern); + } else { + metaType->decideUsagePattern(); } return metaType; @@ -2376,6 +2377,7 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateTypeStatic(const TypeInfo } } + Q_ASSERT(metaType->typeUsagePattern() != AbstractMetaType::InvalidPattern); return metaType.take(); } |