Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integrationv4.8.0-beta

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Doc: Fixing typo

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();