diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-07 10:06:31 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-07 10:06:31 +0200 |
| commit | 5ce20bd3efde4e1c44dee6c4af33b184b520b06b (patch) | |
| tree | ab2f69dfc9cfda5b1c910a06462339d69d105796 /sources | |
| parent | 6a116c6465451e5a58d1467ec926563b68ac677f (diff) | |
| parent | 39c6018e484d2a6850d239de03fef89df730f357 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I299a65f15fb6b7eb900256590bbe76ad0568f546
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 3 | ||||
| -rw-r--r-- | sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 1bbd0bfb0..216b02a4d 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1938,9 +1938,6 @@ <modify-function signature="setNum(short,int)" remove="all"/> <modify-function signature="setNum(qulonglong,int)" remove="all"/> <modify-function signature="number(uint,int)" remove="all"/> - <modify-function signature="number(ushort,int)" remove="all"/> - <modify-function signature="number(float,char,int)" remove="all"/> - <modify-function signature="number(short,int)" remove="all"/> <modify-function signature="number(qulonglong,int)" remove="all"/> <!--### --> diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py index 49ea382f6..e556ec9aa 100644 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py +++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py @@ -439,6 +439,7 @@ def init_PySide2_QtCore(): "4294967295UL": 4294967295, # 5.6, RHEL 6.6 "CheckIndexOption.NoOption": Instance( "PySide2.QtCore.QAbstractItemModel.CheckIndexOptions.NoOption"), # 5.11 + "DescriptorType(-1)": int, # Native handle of QSocketDescriptor "false": False, "list of QAbstractAnimation": typing.List[PySide2.QtCore.QAbstractAnimation], "list of QAbstractState": typing.List[PySide2.QtCore.QAbstractState], @@ -447,6 +448,7 @@ def init_PySide2_QtCore(): "nullptr": None, # 5.9 "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]": @@ -541,10 +543,15 @@ def init_PySide2_QtSql(): def init_PySide2_QtNetwork(): + from PySide2.QtNetwork import QNetworkRequest best_structure = typing.OrderedDict if getattr(typing, "OrderedDict", None) else typing.Dict type_map.update({ "QMultiMap[PySide2.QtNetwork.QSsl.AlternativeNameEntryType, QString]": best_structure[PySide2.QtNetwork.QSsl.AlternativeNameEntryType, typing.List[str]], + "DefaultTransferTimeoutConstant": + QNetworkRequest.TransferTimeoutConstant, + "QNetworkRequest.DefaultTransferTimeoutConstant": + QNetworkRequest.TransferTimeoutConstant, }) del best_structure return locals() |