diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-16 12:58:33 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-16 12:58:33 +0200 |
| commit | 4c93e4299eb210e98adc02d1e02c134e29464537 (patch) | |
| tree | f4ad07fd55ab01605718cee83cb9c16898ec1c42 /sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py | |
| parent | b3491d9aef009a7ee6d796c1217c155618d348e6 (diff) | |
| parent | d1306c1efa629842eda2666307375d4d3951c6dc (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I27beffe4a6e2fc2f818960c3b9f5ffbfaac4a670
Diffstat (limited to 'sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py')
| -rw-r--r-- | sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py index 7a93fcbe9..c64abf9fb 100644 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py +++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py @@ -459,14 +459,6 @@ def init_PySide2_QtCore(): "PyByteArray": bytearray, "PyBytes": bytes, "QDeadlineTimer(QDeadlineTimer.Forever)": Instance("PySide2.QtCore.QDeadlineTimer"), - "PySide2.QtCore.QCborStreamReader.StringResult[PySide2.QtCore.QByteArray]": - 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, |