diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-13 10:30:35 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-13 11:02:12 +0000 |
| commit | 817652ee47bb2fc68734f8ef13417d4546978a42 (patch) | |
| tree | 0cdabb0492dfb65bf4e81e786586de1ea89e4705 /sources/shiboken2/ApiExtractor/typesystem.h | |
| parent | a80ae396c4e497a64c3fed57a9c4628436ad40a4 (diff) | |
shiboken: Remove global-static hashes used for members of TypeEntry
TypeEntry::customConversion and ComplexTypeEntry::defaultConstructor where
previously stored in global-static hashes, apparently due to BC issues.
This can now be fixed.
Task-number: PYSIDE-725
Task-number: PYSIDE-743
Change-Id: If4f28246a5b83e3772021a518058a9d152bb3e3f
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/typesystem.h')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/typesystem.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h index e344e07b4..4b937faa6 100644 --- a/sources/shiboken2/ApiExtractor/typesystem.h +++ b/sources/shiboken2/ApiExtractor/typesystem.h @@ -903,6 +903,7 @@ private: QString m_conversionRule; bool m_stream = false; QVersionNumber m_version; + CustomConversion *m_customConversion = nullptr; }; class TypeSystemTypeEntry : public TypeEntry @@ -1391,6 +1392,7 @@ private: AddedFunctionList m_addedFunctions; FunctionModificationList m_functionMods; FieldModificationList m_fieldMods; + QString m_defaultConstructor; QString m_defaultSuperclass; QString m_qualifiedCppName; QString m_targetLangName; |