diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-06 17:03:40 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-06 17:03:40 +0100 |
| commit | 37cdf54f7b7134b1330ab7e6bf0651f9111759cc (patch) | |
| tree | 3f1c230cfdbcf0f1382aaabf7cf296bdbb95888d /sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py | |
| parent | a3e70f98630f79c1857fd45b1be3272e966bfb7d (diff) | |
| parent | e4aa9e13ac6e4d38c473fc32ea4ace3777df7a57 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ibaf224c58b4137a1aa421ad7d0a1bdd8860514ef
Diffstat (limited to 'sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py')
| -rw-r--r-- | sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py | 4 |
1 files changed, 4 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 2110ebe7a..0767e8fd4 100644 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py +++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py @@ -489,6 +489,10 @@ def init_PySide2_QtCore(): PySide2.QtCore.QCborStringResultByteArray, "PySide2.QtCore.QCborStreamReader.StringResult[QString]": PySide2.QtCore.QCborStringResultString, + "PySide2.QtCore.QCborStreamReader.QCborStringResultByteArray": + PySide2.QtCore.QCborStringResultByteArray, # 5.14, why? + "PySide2.QtCore.QCborStreamReader.QCborStringResultString": + PySide2.QtCore.QCborStringResultString, # 5.14, why? "PySide2.QtCore.QUrl.ComponentFormattingOptions": PySide2.QtCore.QUrl.ComponentFormattingOption, # mismatch option/enum, why??? "PyUnicode": typing.Text, |