diff options
| author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-03-30 10:07:56 +0200 |
|---|---|---|
| committer | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-03-30 10:07:56 +0200 |
| commit | d2be09eef06241cd4c9eb7a0ca1a993dc2355f02 (patch) | |
| tree | 4cd15a74c0629e76a41b30d2e02d22e998fb509d /sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h | |
| parent | ad73193e99fef8f5d1bcf095075596dca88949c1 (diff) | |
| parent | d47fb98e443e3ac5cb18850b2551143c713917f0 (diff) | |
Merge branch '5.14' into 5.14.2v5.14.2
Change-Id: I3f76bc2b1d401d901d6ac5bc74874b0894bf3df9
Diffstat (limited to 'sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h index b381a62cd..be73697f0 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h @@ -136,7 +136,8 @@ public: QString fixDefaultValue(const ArgumentModelItem &item, AbstractMetaType *type, AbstractMetaFunction *fnc, AbstractMetaClass *, int argumentIndex); - AbstractMetaType *translateType(const AddedFunction::TypeInfo &typeInfo); + AbstractMetaType *translateType(const AddedFunction::TypeInfo &typeInfo, + QString *errorMessage); AbstractMetaType *translateType(const TypeInfo &type, AbstractMetaClass *currentClass, TranslateTypeFlags flags = {}, |