summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2015-01-05 16:44:07 +0100
committerKai Koehne <kai.koehne@theqtcompany.com>2015-01-07 16:17:33 +0100
commit8d86c06aef110ad6cf6f1dcb6af56b19ddbe7f24 (patch)
tree83de7bb341cf7a7594a6f9943109093112723e5c /tests
parent8812ca2b3fcaf241209925eea3999b1fe8481b13 (diff)
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>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/installer/scriptengine/tst_scriptengine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
index 91013d028..370d7eef4 100644
--- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp
+++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
@@ -58,8 +58,8 @@ public:
setPage(PackageManagerCore::InstallationFinished, new FinishedPage(core));
foreach (const int id, pageIds()) {
- packageManagerCore()->controlScriptEngine()->addQObjectChildren(page(id));
- packageManagerCore()->componentScriptEngine()->addQObjectChildren(page(id));
+ packageManagerCore()->controlScriptEngine()->addToGlobalObject(page(id));
+ packageManagerCore()->componentScriptEngine()->addToGlobalObject(page(id));
}
}