diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-04-08 14:14:11 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-04-09 13:49:24 +0200 |
commit | 1049b1ed57e3ec591ddb5ebda1b501a102f95019 (patch) | |
tree | 1432b3a5b911f2aed63b962741117e15d615b0a0 | |
parent | e4c51dac4ec2b3d6c6c14ca63d62c11bade62909 (diff) |
shiboken6: Move check in inheritTemplateFunction() around
Pick-to: 6.2
Change-Id: I1957f5f10fb90a732206718f43ac26e8cbe4ef07
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r-- | sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp index 4853b0120..4ed9e85aa 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp @@ -2985,8 +2985,6 @@ AbstractMetaFunctionPtr f->setDeclaringClass(subclass); if (f->isConstructor()) { - if (!subclass->isTypeDef()) - return {}; f->setName(subclass->name()); f->setOriginalName(subclass->name()); } @@ -3045,6 +3043,8 @@ static bool doInheritTemplateFunction(const AbstractMetaFunctionCPtr &function, // declares it via "using"). if (function->isModifiedRemoved()) return false; + if (function->isConstructor() && !subclass->isTypeDef()) + return false; return AbstractMetaFunction::find(existingSubclassFuncs, function->name()) == nullptr || subclass->isUsingMember(templateBaseClass, function->name(), Access::Protected); } |