aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsapi
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@digia.com>2013-10-14 15:40:50 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-14 16:43:51 +0200
commit77e566b6f68a0b6bdf3823fe713470c4865d37d1 (patch)
tree901c52b53e5c1a7e7650757b6cb146ff7e12e65f /src/qml/jsapi
parent3f7f6be40947f19ef4e40a8f10307a1a6dcb31e0 (diff)
Touch up QJSEngine::evaluate documentation.
Change-Id: I350ad1ccb8a6cf522787e4579292fa4ba1c8e043 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi')
-rw-r--r--src/qml/jsapi/qjsengine.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 107ac98cd1..d1bd4934cd 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -241,19 +241,19 @@ void QJSEngine::collectGarbage()
QJSValue::isError()).
\a lineNumber is used to specify a starting line number for \a
- program; line number information reported by the engine that pertain
+ program; line number information reported by the engine that pertains
to this evaluation will be based on this argument. For example, if
\a program consists of two lines of code, and the statement on the
second line causes a script exception, the exception line number
would be \a lineNumber plus one. When no starting line number is
specified, line numbers will be 1-based.
- \a fileName is used for error reporting. For example in error objects
- the file name is accessible through the "fileName" property if it's
+ \a fileName is used for error reporting. For example, in error objects
+ the file name is accessible through the "fileName" property if it is
provided with this function.
\note If an exception was thrown and the exception value is not an
- Error instance (i.e., QJSValue::isError() returns false), the
+ Error instance (i.e., QJSValue::isError() returns \c false), the
exception value will still be returned, but there is currently no
API for detecting that an exception did occur in this case.
*/