From 06449248ab638d3ebb23f03e56450f10b4acbb5c Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 8 May 2013 13:26:41 +0200 Subject: introduce installerscriptengine - it uses one scriptengine for everything and adds the components or/and the install-controller in javascript closure contexts - added the gui object to the component script context - removed tabController from controlscript context Change-Id: I3bd6c5dcf470666c30add1b7d04a8fdd094f5f11 Reviewed-by: Iikka Eklund Reviewed-by: Karsten Heimrich --- src/libs/installer/packagemanagercore_p.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/libs/installer/packagemanagercore_p.cpp') diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index cd413c5b0..d643fd34d 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -43,6 +43,7 @@ #include "adminauthorization.h" #include "binaryformat.h" #include "component.h" +#include "scriptengine.h" #include "componentmodel.h" #include "errors.h" #include "fileutils.h" @@ -209,6 +210,7 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core) , m_repoFetched(false) , m_updateSourcesAdded(false) , m_componentsToInstallCalculated(false) + , m_scriptEngine(0) , m_proxyFactory(0) , m_defaultModel(0) , m_updaterModel(0) @@ -234,6 +236,7 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, q , m_updateSourcesAdded(false) , m_magicBinaryMarker(magicInstallerMaker) , m_componentsToInstallCalculated(false) + , m_scriptEngine(0) , m_proxyFactory(0) , m_defaultModel(0) , m_updaterModel(0) @@ -259,6 +262,7 @@ PackageManagerCorePrivate::~PackageManagerCorePrivate() m_FSEngineClientHandler->setActive(false); delete m_updateFinder; + delete m_scriptEngine; delete m_proxyFactory; delete m_defaultModel; @@ -385,6 +389,13 @@ bool PackageManagerCorePrivate::buildComponentTree(QHash &c return true; } +ScriptEngine *PackageManagerCorePrivate::scriptEngine() +{ + if (!m_scriptEngine) + m_scriptEngine = new ScriptEngine(m_core); + return m_scriptEngine; +} + void PackageManagerCorePrivate::clearAllComponentLists() { qDeleteAll(m_rootComponents); -- cgit v1.2.3