diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-10 12:49:33 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-10 19:48:42 +0000 |
commit | 79c170d8bdafb91da30d17a24d00457f2be478b3 (patch) | |
tree | 74ef24f46510e4b26339fa8d21ff1d3fce6f38c2 /sources/shiboken2/generator/generator.cpp | |
parent | 723ed2053aed8b72ae534fcbaea5aaee7f5ea9ba (diff) |
shiboken: Remove some special handling for QObject's
For types, QObjects are equivalent to objects, there is no need to
differentiate. Remove the code trying to find whether a type is a
QObject.
Only AbstractMetaClass needs to know whether it inherits QObject. Add
a simple check recursing down the base classes.
Change-Id: I2365b451c8873f044b06c09b58aff29e2db3c5b7
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken2/generator/generator.cpp')
-rw-r--r-- | sources/shiboken2/generator/generator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/generator/generator.cpp b/sources/shiboken2/generator/generator.cpp index 4b76c2d2c..87758e533 100644 --- a/sources/shiboken2/generator/generator.cpp +++ b/sources/shiboken2/generator/generator.cpp @@ -538,7 +538,7 @@ bool Generator::isObjectType(const TypeEntry* type) } bool Generator::isObjectType(const ComplexTypeEntry* type) { - return type->isObject() || type->isQObject(); + return type->isObject(); } bool Generator::isObjectType(const AbstractMetaClass* metaClass) { |