diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-24 12:58:53 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-24 12:59:22 +0200 |
| commit | 2c3cbe854f921068346ee78f7dda841116230ede (patch) | |
| tree | acb00b4202ffaab3b565348a530f3ae0f919a555 /sources/pyside2/PySide2/QtGui | |
| parent | 0cf22cc9f74594252bd744d6aee77cd3ee3ae0e8 (diff) | |
| parent | e24392c76e5cfdd2d6d51bd853b106db2bc4cb80 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie90b31ed1b88f1353261fc4040db2d788df279e6
Diffstat (limited to 'sources/pyside2/PySide2/QtGui')
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index b679abc87..015393c30 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -1752,7 +1752,7 @@ PyErr_Format(PyExc_TypeError, "Invalid return value in function %s, expected %s, got %s.", "QValidator.validate", "PySide2.QtGui.QValidator.State, (PySide2.QtGui.QValidator.State,), (PySide2.QtGui.QValidator.State, unicode) or (PySide2.QtGui.QValidator.State, unicode, int)", - PepType((Py_TYPE(pyResult)))->tp_name); + Py_TYPE(pyResult)->tp_name); return QValidator::State(); } </template> |