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/shiboken2/shibokengenerator.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/shiboken2/shibokengenerator.cpp')
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp index b5069db14..9328e6ba0 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp @@ -729,8 +729,7 @@ QString ShibokenGenerator::getFormatUnitString(const AbstractMetaFunction* func, if (!func->typeReplaced(arg->argumentIndex() + 1).isEmpty()) { result += QLatin1Char(objType); - } else if (arg->type()->isQObject() - || arg->type()->isObject() + } else if (arg->type()->isObject() || arg->type()->isValue() || arg->type()->isValuePointer() || arg->type()->isNativePointer() |