Prevented QWizard from crashing upon removing a page after deleting a field object.

QWizard crashed when removing a page after deleting an object
that was already registered as a field for the page. This patch
prevents such a crash by doing the necessary cleanup immediately
when the object is deleted. QWizard::removePage() will then see a
consistent state in this case.

Reviewed-by: janarve
Task-number: 255350

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/auto/qwizard/tst_qwizard.cpp b/tests/auto/qwizard/tst_qwizard.cpp
index 71e1c3e5c8..e5074b3c01 100644
--- a/tests/auto/qwizard/tst_qwizard.cpp
+++ b/tests/auto/qwizard/tst_qwizard.cpp
@@ -112,6 +112,7 @@ private slots:
     void task161658_alignments();
     void task177022_setFixedSize();
     void task248107_backButton();
+    void task255350_fieldObjectDestroyed();
 
     /*
         Things that could be added:
@@ -2517,5 +2518,26 @@ void tst_QWizard::task248107_backButton()
     QCOMPARE(wizard.currentPage(), &page1);
 }
 
+class WizardPage_task255350 : public QWizardPage
+{
+public:
+    QLineEdit *lineEdit;
+    WizardPage_task255350()
+        : lineEdit(new QLineEdit)
+    {
+        registerField("dummy*", lineEdit);
+    }
+};
+
+void tst_QWizard::task255350_fieldObjectDestroyed()
+{
+    QWizard wizard;
+    WizardPage_task255350 *page = new WizardPage_task255350;
+    int id = wizard.addPage(page);
+    delete page->lineEdit;
+    wizard.removePage(id); // don't crash!
+    delete page;
+}
+
 QTEST_MAIN(tst_QWizard)
 #include "tst_qwizard.moc"