diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:42 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:47 +0200 |
commit | 67d635fe2cc2c89c30486a2e26dea4106a9d9c16 (patch) | |
tree | b26f1bb7a9639f2b2a875c0cb2b937858b700add /sources/pyside2/tests/QtCore | |
parent | ffd068caf7063799e0196602e31ca7b1781c3f97 (diff) | |
parent | 75f824b13a2ef12a9a5a33db19216b4e43a72922 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I389468b76913ac3c8113ab89833c756a7a72e54f
Diffstat (limited to 'sources/pyside2/tests/QtCore')
-rw-r--r-- | sources/pyside2/tests/QtCore/qmetaobject_test.py | 2 | ||||
-rw-r--r-- | sources/pyside2/tests/QtCore/qobject_connect_notify_test.py | 2 | ||||
-rw-r--r-- | sources/pyside2/tests/QtCore/qslot_object_test.py | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sources/pyside2/tests/QtCore/qmetaobject_test.py b/sources/pyside2/tests/QtCore/qmetaobject_test.py index 73ab81c7c..81a3e7015 100644 --- a/sources/pyside2/tests/QtCore/qmetaobject_test.py +++ b/sources/pyside2/tests/QtCore/qmetaobject_test.py @@ -60,7 +60,7 @@ class qmetaobject_test(unittest.TestCase): f = QFile() fm = f.metaObject() self.assertEqual(m.methodCount(), fm.methodCount()) - """ + """ def test_DynamicSlotSignal(self): o = DynObject() diff --git a/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py b/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py index 68f79161d..fdd71957b 100644 --- a/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py +++ b/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py @@ -59,7 +59,7 @@ class TestQObjectConnectNotify(UsesQCoreApplication): '''Test case for QObject::connectNotify''' def setUp(self): UsesQCoreApplication.setUp(self) - self.called = False + self.called = False def tearDown(self): UsesQCoreApplication.tearDown(self) diff --git a/sources/pyside2/tests/QtCore/qslot_object_test.py b/sources/pyside2/tests/QtCore/qslot_object_test.py index cfb9e7883..b8d5513ff 100644 --- a/sources/pyside2/tests/QtCore/qslot_object_test.py +++ b/sources/pyside2/tests/QtCore/qslot_object_test.py @@ -42,7 +42,7 @@ class objTest(QtCore.QObject): def slot(self): global qApp - + self.ok = True qApp.quit() @@ -51,8 +51,8 @@ class objTest(QtCore.QObject): class slotTest(unittest.TestCase): def quit_app(self): global qApp - - qApp.quit() + + qApp.quit() def testBasic(self): global qApp |