Restart on the wizard needs to cleanup component left-overs

  - use two different script engine instances
    - one which lives from the beginning -> the controlScriptEngine
    - the other one which will be reset if there are some new repositories
      loaded
  - now the core has a pointer to the gui object, but it should only be
    used by the script engine so a QObject type should be enough
  - engines are deleted as QObject children from the PackageManagerCore
  - registered downloaded archives are removed

Change-Id: I60a4a32fb2e409059839ec11b10c57357454f57a
Reviewed-by: Michal Klocek <michal.klocek@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

1 files changed, 20 insertions, 2 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 5a4deec3d..fc1ecff02 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -428,6 +428,19 @@ void PackageManagerCore::reset(const QHash<QString, QString> &params)
     d->initialize(params);
 }
 
+void PackageManagerCore::setGuiObject(QObject *gui)
+{
+    if (gui == d->m_guiObject)
+        return;
+    d->m_guiObject = gui;
+    emit guiObjectChanged(gui);
+}
+
+QObject *PackageManagerCore::guiObject() const
+{
+    return d->m_guiObject;
+}
+
 /*!
     \qmlmethod void QInstaller::setCompleteUninstallation(bool complete)
 
@@ -1090,9 +1103,14 @@ void PackageManagerCore::setTestChecksum(bool test)
     d->m_testChecksum = test;
 }
 
-ScriptEngine *PackageManagerCore::scriptEngine()
+ScriptEngine *PackageManagerCore::componentScriptEngine() const
+{
+    return d->componentScriptEngine();
+}
+
+ScriptEngine *PackageManagerCore::controlScriptEngine() const
 {
-    return d->scriptEngine();
+    return d->controlScriptEngine();
 }
 
 /*!