diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-20 19:59:06 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-20 19:59:29 +0200 |
| commit | e8d90a9e62898d3b746772d9ae8542b87efcecf8 (patch) | |
| tree | f4ad1e6906f5a9ea805b677d6d878204b64e85e3 /sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py | |
| parent | f1bcf7d077282f9248aee570545765ef60af00e3 (diff) | |
| parent | a14ea7738f493280f5c7b6e4a8834a7d1daacd1e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iaabea628351fac9da88b5779b537f62262ff82a7
Diffstat (limited to 'sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py')
| -rw-r--r-- | sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py | 10 |
1 files changed, 10 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 c64abf9fb..bb8ce48bf 100644 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py +++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py @@ -499,6 +499,16 @@ def init_PySide2_QtCore(): return locals() +def init_PySide2_QtConcurrent(): + type_map.update({ + "PySide2.QtCore.QFuture[QString]": + PySide2.QtConcurrent.QFutureQString, + "PySide2.QtCore.QFuture[void]": + PySide2.QtConcurrent.QFutureVoid, + }) + return locals() + + def init_PySide2_QtGui(): from PySide2.QtGui import QPageLayout, QPageSize # 5.12 macOS type_map.update({ |