diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-21 10:03:13 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-21 10:14:50 +0100 |
| commit | 711c579ffa053acfe49879960bfb1b1b1b5f4c8b (patch) | |
| tree | db9036908d52db1dedf74fe5dd07a9132d7c547d /src/libs/installer/scriptengine.h | |
| parent | 515b96469d39c8dfd5ba823ecac371414c02e552 (diff) | |
| parent | 7b584f55c2fee55aabd852aa836d6d8295ee1b22 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
Change-Id: Ia5dd8dfbaa2289f1b167191d6997a5f4340721a2
Diffstat (limited to 'src/libs/installer/scriptengine.h')
| -rw-r--r-- | src/libs/installer/scriptengine.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libs/installer/scriptengine.h b/src/libs/installer/scriptengine.h index c4352d4ca..5b8a3a3ec 100644 --- a/src/libs/installer/scriptengine.h +++ b/src/libs/installer/scriptengine.h @@ -43,6 +43,7 @@ namespace QInstaller { class PackageManagerCore; +class GuiProxy; class INSTALLER_EXPORT ScriptEngine : public QObject { @@ -57,8 +58,8 @@ public: QJSValue evaluate(const QString &program, const QString &fileName = QString(), int lineNumber = 1); - void addQObjectChildren(QObject *root); - void removeQObjectChildren(QObject *root); + void addToGlobalObject(QObject *object); + void removeFromGlobalObject(QObject *object); QJSValue loadInContext(const QString &context, const QString &fileName, const QString &scriptInjection = QString()); @@ -77,6 +78,7 @@ private: private: QJSEngine m_engine; QHash<QString, QStringList> m_callstack; + GuiProxy *m_guiProxy; }; } |