From 8d86c06aef110ad6cf6f1dcb6af56b19ddbe7f24 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 5 Jan 2015 16:44:07 +0100 Subject: 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 --- tests/auto/installer/scriptengine/tst_scriptengine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') 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)); } } -- cgit v1.2.3