diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-17 07:56:30 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-17 08:22:55 +0200 |
| commit | 4c5e405e691f707f2765b5f920c28213a36d22e5 (patch) | |
| tree | 48000f220fc2c4365b276146e3d08a05c3a90312 /sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py | |
| parent | 53181fb95d3884cc067d005f37accd92d128bccc (diff) | |
| parent | 38814354ff6a30258b79947304fd3a6be4dc7089 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I8aa48d07067c45c888c73af87314f6a88c2a6e14
Diffstat (limited to 'sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py')
| -rw-r--r-- | sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py index c39ceeb67..817790c50 100644 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py +++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py @@ -265,6 +265,7 @@ type_map.update({ "qulonglong": int, "QVariant": Variant, "QVector": typing.List, + "QSharedPointer": typing.Tuple, "real": float, "short": int, "signed char": int, |