Merge tag 'v5.15.6-lts' into tqtc/lts-5.15-opensourcev5.15.6-lts-lgpl

Qt For Python Release 5.15.6

Change-Id: I7a6874dfca79fbc46f5a6101e713b0c1dde9a640

1 files changed, 30 insertions, 0 deletions

diff --git a/sources/pyside2/tests/QtCore/qobject_parent_test.py b/sources/pyside2/tests/QtCore/qobject_parent_test.py
index 0a02fbc26..becc7c48e 100644
--- a/sources/pyside2/tests/QtCore/qobject_parent_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_parent_test.py
@@ -39,6 +39,16 @@ init_test_paths(False)
 
 from PySide2.QtCore import *
 
+class TestObject1(QTimer):
+    def __init(self, parent):
+        super().__init__(parent)
+
+
+class TestObject2(TestObject1):
+    def __init(self, parent):
+        super().__init__(parent)
+
+
 class ParentRefCountCase(unittest.TestCase):
     '''Test case for the refcount changes of setParent'''
 
@@ -158,6 +168,26 @@ class ParentCase(unittest.TestCase):
         child = QObject(parent)
         self.assertEqual(parent, child.parent())
 
+    def testFindChildByType(self):
+        parent = QObject()
+        expected = TestObject2(parent)
+        actual = parent.findChild(TestObject2)
+        self.assertEqual(actual, expected)
+        actual = parent.findChild(TestObject1)
+        self.assertEqual(actual, expected)
+        actual = parent.findChild(QTimer)
+        self.assertEqual(actual, expected)
+
+    def testFindChildrenByType(self):
+        parent = QObject()
+        expected = [TestObject2(parent)]
+        actual = parent.findChildren(TestObject2)
+        self.assertEqual(actual, expected)
+        actual = parent.findChildren(TestObject1)
+        self.assertEqual(actual, expected)
+        actual = parent.findChildren(QTimer)
+        self.assertEqual(actual, expected)
+
 
 class TestParentOwnership(unittest.TestCase):
     '''Test case for Parent/Child object ownership'''