diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-11-06 17:06:15 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-11-06 17:06:15 +0100 |
| commit | e14d0b31bc8305b42f2843242adaebb8f50148cb (patch) | |
| tree | 23f2d68a82cc8894a569d759ce865b998971b4e2 /tests | |
| parent | f1ef0626125bf89e73407f2c5a860b3dc9e68e6d (diff) | |
| parent | 016cdad413c878be9c669398cd707ff5d1d98255 (diff) | |
Merge remote-tracking branch 'origin/1.4' into 1.5
Change-Id: I2725f9bacbe04240dc3f97062c5ebc50884822c8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/installer/scriptengine/tst_scriptengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp index b626d5a2e..5c67afd0c 100644 --- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp +++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp @@ -61,7 +61,7 @@ private slots: m_component->setValue("Default", "Script"); m_component->setValue(scName, "component.test.name"); - m_scriptEngine = m_core.scriptEngine(); + m_scriptEngine = m_core.componentScriptEngine(); } void testBrokenJSMethodConnect() |