Simplify registration of objects into script engine

Rename addQObjectChildren, removeQObjectChildren methods to
addToGlobalObject, removeToGlobalObject, and merge the augmentation
of the properties with newQObject.

Also, don't recursively register all objects with their objectNames
in the global scope. This avoids name pollution.

Change-Id: I28f1bc67e6febecc7b5142982c918432b61ed96f
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/libs/installer/scriptengine.h b/src/libs/installer/scriptengine.h
index c4352d4ca..c5219dc09 100644
--- a/src/libs/installer/scriptengine.h
+++ b/src/libs/installer/scriptengine.h
@@ -57,8 +57,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());