summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/scriptengine.cpp
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-11-06 12:45:23 +0100
committerTim Jenssen <tim.jenssen@digia.com>2013-11-06 16:51:35 +0100
commit016cdad413c878be9c669398cd707ff5d1d98255 (patch)
tree384a45a3ecd01fe5b071aca445dfca9cff59a731 /src/libs/installer/scriptengine.cpp
parent0e63df370ec23e793c0bfb27c469f2606fbf104a (diff)
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>
Diffstat (limited to 'src/libs/installer/scriptengine.cpp')
-rw-r--r--src/libs/installer/scriptengine.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp
index 4e236be7f..9931d956e 100644
--- a/src/libs/installer/scriptengine.cpp
+++ b/src/libs/installer/scriptengine.cpp
@@ -212,6 +212,9 @@ ScriptEngine::ScriptEngine(PackageManagerCore *core)
.setProperty(QLatin1String("components"), scriptComponentsObject);
connect(this, SIGNAL(signalHandlerException(QScriptValue)), SLOT(handleException(QScriptValue)));
+
+ connect(core, SIGNAL(guiObjectChanged(QObject*)), this, SLOT(setGuiQObject(QObject*)));
+ setGuiQObject(core->guiObject());
}
ScriptEngine::~ScriptEngine()