diff options
author | dac <qt-info@nokia.com> | 2010-08-04 10:29:59 +1000 |
---|---|---|
committer | dac <qt-info@nokia.com> | 2010-08-04 10:29:59 +1000 |
commit | 566ebf5793235758f168f54c798f970bff8f8e5b (patch) | |
tree | 720dbffb2ee2874e51ca41d3ff649d3e350814e1 /interpreter/qtscript_bindings.cpp | |
parent | 2793b135c6faec221cf8e63d76b6e6cc31c6717e (diff) |
Fix: when running test more than once, the QtScript plugins (and additional
stuff) get reloaded into engine, which results in test failures. Now the
engine is reused when re-running same script, or recreated properly if
running a new script. Also reactivate QTUITEST_DEFAULT_AUT_ARGS to allow
running tests in Xephyr.
Diffstat (limited to 'interpreter/qtscript_bindings.cpp')
-rw-r--r-- | interpreter/qtscript_bindings.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/interpreter/qtscript_bindings.cpp b/interpreter/qtscript_bindings.cpp index b53d664..7692290 100644 --- a/interpreter/qtscript_bindings.cpp +++ b/interpreter/qtscript_bindings.cpp @@ -204,8 +204,7 @@ QtScriptTest::QtScriptTest(QString const &testFilePath, QString const &scriptDat if (m_testFilePath.isEmpty()) m_testFilePath="testcase.js"; - if (!m_engine) m_engine = new QScriptEngine(this); - m_engine->importExtension("qt.core"); +// m_engine->importExtension("qt.core"); QScriptValue qtestObject = m_engine->newObject(); qtestObject.setProperty("SkipSingle", QScriptValue(m_engine, QTest::SkipSingle)); |