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, 8 insertions, 2 deletions

diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 445235a0d..a6b9d4438 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -135,7 +135,10 @@ public:
 
     bool buildComponentTree(QHash<QString, Component*> &components, bool loadScript);
 
-    ScriptEngine *scriptEngine();
+    void cleanUpComponentEnvironment();
+    ScriptEngine *componentScriptEngine() const;
+    ScriptEngine *controlScriptEngine() const;
+
     void clearAllComponentLists();
     void clearUpdaterComponentLists();
     QList<Component*> &replacementDependencyComponents();
@@ -263,7 +266,8 @@ private:
     qint64 m_magicBinaryMarker;
     bool m_componentsToInstallCalculated;
 
-    ScriptEngine *m_scriptEngine;
+    mutable ScriptEngine *m_componentScriptEngine;
+    mutable ScriptEngine *m_controlScriptEngine;
     // < name (component to replace), < replacement component, component to replace > >
     QHash<QString, QPair<Component*, Component*> > m_componentsToReplaceAllMode;
     QHash<QString, QPair<Component*, Component*> > m_componentsToReplaceUpdaterMode;
@@ -285,6 +289,8 @@ private:
     ComponentModel *m_defaultModel;
     ComponentModel *m_updaterModel;
 
+    QObject *m_guiObject;
+
 private:
     // remove once we deprecate isSelected, setSelected etc...
     void resetComponentsToUserCheckedState();