diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-06 14:59:57 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-06 15:00:02 +0200 |
| commit | e2805675caca2f275f7074e94e3cf04de55f0b3a (patch) | |
| tree | 6f5bc7b2272815f503e62d99ca2e70a93893cfd4 /sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | |
| parent | e729091759156f417d987ede9de8961d33f28079 (diff) | |
| parent | b20dfab4bc9a4887160e359b8d23dd25760ff948 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I52be54b4bd400df557255b7d88eb22cb7260ca31
Diffstat (limited to 'sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp index c879727c3..84c116708 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp @@ -1913,7 +1913,7 @@ bool AbstractMetaBuilderPrivate::setArrayArgumentType(AbstractMetaFunction *func AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(FunctionModelItem functionItem) { - if (!functionItem->templateParameters().isEmpty()) + if (functionItem->isDeleted() || !functionItem->templateParameters().isEmpty()) return nullptr; QString functionName = functionItem->name(); QString className; |