diff options
-rw-r--r-- | PySide/QtCore/typesystem_core.xml | 1 | ||||
-rw-r--r-- | tests/QtCore/qthread_test.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index c5d3ac552..b5243c6c2 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -1167,7 +1167,6 @@ <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="thread() const" remove="all"/> <modify-function signature="connect(const QObject*, const char*, const char *, Qt::ConnectionType) const"> <modify-argument index="4"> <rename to="type"/> diff --git a/tests/QtCore/qthread_test.py b/tests/QtCore/qthread_test.py index 410afb908..dc99c8e6c 100644 --- a/tests/QtCore/qthread_test.py +++ b/tests/QtCore/qthread_test.py @@ -17,6 +17,7 @@ class Dummy(QThread): def run(self): #Start-quit sequence + self.qobj = QObject() mutex.lock() self.called = True mutex.unlock() @@ -70,6 +71,7 @@ class QThreadSimpleCase(UsesQCoreApplication): QTimer.singleShot(1000, self.abort_application) self.app.exec_() + self.assertEqual(obj.qobj.thread(), obj) # test QObject.thread() method self.assert_(self.called) if __name__ == '__main__': |