Make sure we remove ui elements we added.

This fixes several problems, e.g. once a component script has been
run, possible ui elements or even complete pages have been added.
On a second component script run these elements would have been
added again etc... Now we remove all pages and widget by default.

Change-Id: I47a3283ce06767c28529201432b71c0b4f12e533
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/installerbuilder/libinstaller/component_p.cpp b/installerbuilder/libinstaller/component_p.cpp
index fb63f6d6f..a6e34aa02 100644
--- a/installerbuilder/libinstaller/component_p.cpp
+++ b/installerbuilder/libinstaller/component_p.cpp
@@ -59,6 +59,22 @@ ComponentPrivate::ComponentPrivate(PackageManagerCore *core, Component *qq)
 {
 }
 
+ComponentPrivate::~ComponentPrivate()
+{
+    // Before we can delete the added widgets, they need to be removed from the wizard first.
+    QMap<QString, QPointer<QWidget> >::const_iterator it;
+    foreach (const QString &widgetName, m_userInterfaces.keys()) {
+        m_core->removeWizardPage(q, widgetName);
+        m_core->removeWizardPageItem(q, widgetName);
+    }
+
+    // Use QPointer here instead of raw pointers. This is a requirement that needs to be met cause possible
+    // Ui elements get added during component script run and might be destroyed by the package manager gui
+    // before the actual component gets destroyed. Avoids a possible delete call on a dangling pointer.
+    foreach (const QPointer<QWidget> widget, m_userInterfaces)
+        delete widget.data();
+}
+
 void ComponentPrivate::init()
 {
     // register translation stuff