diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-24 08:50:12 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-24 08:50:12 +0200 |
| commit | d9aed0193b47664af5ec6b92f99fe8cca7f94246 (patch) | |
| tree | c1aa628b681ef5c8d924e33194b90f8804dcf9e5 /sources/pyside2/PySide2/QtCore | |
| parent | b45a890df5bb26c3a4feb8d57dd994fdaaf9c750 (diff) | |
| parent | b5a574eaeeb6a4f30794e6012b96f05a3de49217 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ide71a89ef173d6f3e1fa6960f7b15f1fd6cc1bf1
Diffstat (limited to 'sources/pyside2/PySide2/QtCore')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index a82ff328e..9e65bff7f 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -422,7 +422,7 @@ converter.toCpp(pyIn, var.data()); %out = var; </add-conversion> - <add-conversion type="PyDict"> + <add-conversion type="PyDict" check="PyDict_CheckExact(%in)"> QVariant ret = QVariant_convertToVariantMap(%in); %out = ret.isValid() ? ret : QVariant::fromValue<PySide::PyObjectWrapper>(%in); </add-conversion> |