diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-11-06 12:45:23 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-11-06 16:51:35 +0100 |
commit | 016cdad413c878be9c669398cd707ff5d1d98255 (patch) | |
tree | 384a45a3ecd01fe5b071aca445dfca9cff59a731 /src/libs/installer/packagemanagercore.h | |
parent | 0e63df370ec23e793c0bfb27c469f2606fbf104a (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/packagemanagercore.h')
-rw-r--r-- | src/libs/installer/packagemanagercore.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h index 557c4d9ed..392e5a018 100644 --- a/src/libs/installer/packagemanagercore.h +++ b/src/libs/installer/packagemanagercore.h @@ -125,6 +125,9 @@ public: bool run(); void reset(const QHash<QString, QString> ¶ms); + void setGuiObject(QObject *gui); + QObject *guiObject() const; + Q_INVOKABLE void setDependsOnLocalInstallerBinary(); Q_INVOKABLE bool localInstallerBinaryUsed(); @@ -177,7 +180,8 @@ public: Q_INVOKABLE bool fileExists(const QString &filePath) const; public: - ScriptEngine *scriptEngine(); + ScriptEngine *componentScriptEngine() const; + ScriptEngine *controlScriptEngine() const; // component handling @@ -301,6 +305,8 @@ Q_SIGNALS: void setAutomatedPageSwitchEnabled(bool request); void coreNetworkSettingsChanged(); + void guiObjectChanged(QObject *gui); + private: struct Data { Package *package; |