diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-21 19:13:32 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-21 19:13:32 +0200 |
commit | 55fd16d92a36558335e7d7cd7cdb57ead43d55db (patch) | |
tree | 2573c4fabdb80535972a3c91a262f2e3fa80cf80 /sources/shiboken2/tests/smartbinding/typesystem_smart.xml | |
parent | e8d90a9e62898d3b746772d9ae8542b87efcecf8 (diff) | |
parent | 85bb24c39df53ea61f59351a60f4284c32cb50ff (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I8831b840fa7816b8919ecbaab17b41822a0a6012
Diffstat (limited to 'sources/shiboken2/tests/smartbinding/typesystem_smart.xml')
-rw-r--r-- | sources/shiboken2/tests/smartbinding/typesystem_smart.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sources/shiboken2/tests/smartbinding/typesystem_smart.xml b/sources/shiboken2/tests/smartbinding/typesystem_smart.xml index 8fb3082a0..46cb08267 100644 --- a/sources/shiboken2/tests/smartbinding/typesystem_smart.xml +++ b/sources/shiboken2/tests/smartbinding/typesystem_smart.xml @@ -34,6 +34,7 @@ </conversion-rule> </container-type> + <custom-type name="std::shared_ptr" /> <!-- Used in tests to check what C++ objects are allocated. --> <object-type name="Registry" /> |