diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-06 13:07:21 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-07-06 13:32:51 +0000 |
| commit | d23b43816a7ed6a9513b2213a7e633eed2155769 (patch) | |
| tree | 0bdcb02176e6620b2c55306eb44c191d8109f634 /sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | |
| parent | 41dc5daf2e622ceb9cdf567f749fa103014042ee (diff) | |
| parent | e2805675caca2f275f7074e94e3cf04de55f0b3a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
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 e95cf202b..340ed846a 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; |