From 4c610300e34d0bbbd1dac912f34127ff08ea04be Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 4 Apr 2025 14:28:52 +0200 Subject: [PATCH] tst_QPointer: make DerivedParent delete all children ... not just 'derivedChild'. This doesn't change anything for the test right now, but will enable an extended test to be added on top. Pick-to: 6.9 6.8 6.5 5.15 Change-Id: Id52f785168c97c43433fb15a6a71a9d1fb140036 Reviewed-by: Thiago Macieira --- tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp index b88f1b5b0ff..5ac9cb3af13 100644 --- a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp +++ b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp @@ -3,6 +3,8 @@ #include #include + +#include #include #include @@ -383,7 +385,7 @@ DerivedParent::DerivedParent() DerivedParent::~DerivedParent() { - delete derivedChild; + QObjectPrivate::get(this)->deleteChildren(); // like ~QWidget() does } DerivedChild::~DerivedChild()