diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-20 08:37:56 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-20 08:38:22 +0200 |
| commit | 6b0fd960c1b5e99fbd6952f3726646374e956dde (patch) | |
| tree | 27e565b94a949d48001e80bf127f94a1c44e2b0b /sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | |
| parent | aa58ad6e8b1f44f7c05aaeb39dfb02d33469d97b (diff) | |
| parent | 877c9be79d660fe1317a6fb46c585fb688abc21e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I5dd997d995feae2ddf207eb213fb08233dece77c
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index cce9c7076..a82ff328e 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -426,7 +426,7 @@ QVariant ret = QVariant_convertToVariantMap(%in); %out = ret.isValid() ? ret : QVariant::fromValue<PySide::PyObjectWrapper>(%in); </add-conversion> - <add-conversion type="PySequence"> + <add-conversion type="PyList" check="PyList_Check(%in)"> QVariant ret = QVariant_convertToVariantList(%in); %out = ret.isValid() ? ret : QVariant::fromValue<PySide::PyObjectWrapper>(%in); </add-conversion> @@ -2134,11 +2134,6 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> - <modify-function signature="setSourceModel(QAbstractItemModel*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> </object-type> <object-type name="QSortFilterProxyModel"> <!-- ### This reimplementation of "QObject::parent()" is used in C++ only |