diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-10-28 15:09:16 -0200 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-10-28 15:09:16 -0200 |
commit | ec0d05f8589236865906faa30441bd04d56b4409 (patch) | |
tree | fa4b49fb1a7236be2a8b83302db65322079a6b33 | |
parent | 31a4f12f4cb358fa05726379c2a40106563e47ea (diff) |
Fix crashes caused by the newer changes on shiboken generator.
-rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 4 | ||||
-rw-r--r-- | PySide/QtOpenGL/typesystem_opengl.xml | 8 | ||||
-rw-r--r-- | PySide/QtScript/typesystem_script.xml | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 8593d6381..b54dfb6e0 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -5488,10 +5488,10 @@ <value-type name="QTileRules"/> - <value-type name="QTouchEvent"> + <object-type name="QTouchEvent"> <enum-type name="DeviceType"/> <value-type name="TouchPoint"/> - </value-type> + </object-type> <value-type name="QVector2D"> <add-function signature="__reduce__" return-type="PyObject*"> diff --git a/PySide/QtOpenGL/typesystem_opengl.xml b/PySide/QtOpenGL/typesystem_opengl.xml index b94e8af32..f58d84940 100644 --- a/PySide/QtOpenGL/typesystem_opengl.xml +++ b/PySide/QtOpenGL/typesystem_opengl.xml @@ -119,8 +119,8 @@ <inject-code class="target" position="beginning"> int size = %2; if (size < 0) - size = %1->size(); - %CPPSELF.allocate((const void*) %1->data(), size); + size = %1.size(); + %CPPSELF.allocate((const void*) %1.data(), size); </inject-code> </modify-function> <modify-function signature="map(QGLBuffer::Access)"> @@ -159,8 +159,8 @@ <inject-code class="target" position="beginning"> int size = %3; if (size < 0) - size = %2->size(); - %CPPSELF.write(%1, (const void*) %2->data(), size); + size = %2.size(); + %CPPSELF.write(%1, (const void*) %2.data(), size); </inject-code> </modify-function> </object-type> diff --git a/PySide/QtScript/typesystem_script.xml b/PySide/QtScript/typesystem_script.xml index c71a60f27..e23542e61 100644 --- a/PySide/QtScript/typesystem_script.xml +++ b/PySide/QtScript/typesystem_script.xml @@ -43,7 +43,7 @@ </object-type> <object-type name="QScriptExtensionInterface"/> <object-type name="QScriptExtensionPlugin"/> - <object-type name="QScriptProgram"/> + <value-type name="QScriptProgram"/> <value-type name="QScriptString"/> <value-type name="QScriptValue"> <enum-type name="PropertyFlag" flags="QScriptValue::PropertyFlags"/> |