diff options
-rw-r--r-- | PySide/QtDeclarative/pysideqmlregistertype.cpp | 5 | ||||
-rw-r--r-- | tests/QtDeclarative/bug_995.py | 2 | ||||
-rw-r--r-- | tests/QtDeclarative/qdeclarativeview_test.py | 1 | ||||
-rw-r--r-- | tests/QtDeclarative/registertype.py | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/PySide/QtDeclarative/pysideqmlregistertype.cpp b/PySide/QtDeclarative/pysideqmlregistertype.cpp index 34fd3ddfe..1fc802012 100644 --- a/PySide/QtDeclarative/pysideqmlregistertype.cpp +++ b/PySide/QtDeclarative/pysideqmlregistertype.cpp @@ -197,12 +197,11 @@ void propListTpFree(void* self) PySideProperty* pySelf = reinterpret_cast<PySideProperty*>(self); delete reinterpret_cast<DeclarativeListProperty*>(PySide::Property::userData(pySelf)); // calls base type constructor - pySelf->ob_type->tp_base->tp_free(self); + Py_TYPE(pySelf)->tp_base->tp_free(self); } PyTypeObject PropertyListType = { - PyObject_HEAD_INIT(0) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(0, 0) "ListProperty", /*tp_name*/ sizeof(PySideProperty), /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/tests/QtDeclarative/bug_995.py b/tests/QtDeclarative/bug_995.py index acdf148f2..e44f50e52 100644 --- a/tests/QtDeclarative/bug_995.py +++ b/tests/QtDeclarative/bug_995.py @@ -9,5 +9,5 @@ view.resize(200, 200) item = view.itemAt(100, 100) # it CAN NOT crash here -print item +print(item) diff --git a/tests/QtDeclarative/qdeclarativeview_test.py b/tests/QtDeclarative/qdeclarativeview_test.py index f8f3a549b..468de976d 100644 --- a/tests/QtDeclarative/qdeclarativeview_test.py +++ b/tests/QtDeclarative/qdeclarativeview_test.py @@ -41,7 +41,6 @@ class TestQDeclarativeView(TimedQApplication): def testModelExport(self): - print "TEST" view = QDeclarativeView() dataList = [MyObject("Item 1"), MyObject("Item 2"), MyObject("Item 3"), MyObject("Item 4")] diff --git a/tests/QtDeclarative/registertype.py b/tests/QtDeclarative/registertype.py index 434dac1ef..c752ebf0a 100644 --- a/tests/QtDeclarative/registertype.py +++ b/tests/QtDeclarative/registertype.py @@ -50,7 +50,7 @@ class PieChart (QDeclarativeItem): def __init__(self, parent = None): QDeclarativeItem.__init__(self, parent) - self._name = u'' + self._name = '' self._slices = [] def getName(self): @@ -59,7 +59,7 @@ class PieChart (QDeclarativeItem): def setName(self, value): self._name = value - name = Property(unicode, getName, setName) + name = Property(str, getName, setName) def appendSlice(self, _slice): global appendCalled |