diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-08-04 02:12:03 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-08-04 02:12:03 (GMT) |
| commit | c3702db732744ea508522a96eb258d4873dd273f (patch) | |
| tree | f9e3ed495fea03b5e3a04852804ad8592d29e562 /tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp | |
| parent | 29d988d113aac1a193d3af6247a6e8231f3f3c9e (diff) | |
| parent | 920ce5ed71bc456e429b887801a8d8bea7a3db0d (diff) | |
| download | Qt-c3702db732744ea508522a96eb258d4873dd273f.zip Qt-c3702db732744ea508522a96eb258d4873dd273f.tar.gz Qt-c3702db732744ea508522a96eb258d4873dd273f.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/declarative/qtbinding.qdoc
Diffstat (limited to 'tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp')
| -rw-r--r-- | tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp index 2390f19..7da647d 100644 --- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp +++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp @@ -815,7 +815,7 @@ void tst_QScriptEngineAgent::functionEntryAndExit_native2() /** check behaiviour of native function throwing error*/ void tst_QScriptEngineAgent::functionEntryAndExit_nativeThrowing() { - /* This function was changed from old backend. JSC return more Entrys / Exits, (exactly +1) + /* This function was changed from old backend. JSC return more Entries / Exits, (exactly +1) in exception creation time */ QScriptEngine eng; @@ -2356,7 +2356,7 @@ void tst_QScriptEngineAgent::hasUncaughtException() QVERIFY2(spy->isPass(), "At least one of a functionExit event should set hasUncaughtException flag."); spy->reset(); - // Check catched exception. + // Check caught exception. eng.evaluate("function innerFoo() { throw new Error('ciao') }"); eng.evaluate("function foo() {try { innerFoo() } catch (e) {} }"); scriptValue = QScriptValue(eng.globalObject().property("foo")).call(); |